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

(Portage version: 2.2.0_alpha155/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

3 files changed, 13 insertions, 10 deletions

diff --git a/net-wireless/ipw2200-firmware/ChangeLog b/net-wireless/ipw2200-firmware/ChangeLog
index e32bada60c8e..44fd2f001b0f 100644
--- a/net-wireless/ipw2200-firmware/ChangeLog
+++ b/net-wireless/ipw2200-firmware/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/ipw2200-firmware
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200-firmware/ChangeLog,v 1.22 2012/12/11 17:32:34 axs Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200-firmware/ChangeLog,v 1.23 2013/01/21 22:30:40 ssuominen Exp $
+
+  21 Jan 2013; Samuli Suominen <ssuominen@gentoo.org>
+  ipw2200-firmware-2.2.ebuild, ipw2200-firmware-3.1.ebuild:
+  Remove sys-apps/hotplug dependency from || () in favour of virtual/udev wrt
+  #145809
 
   11 Dec 2012; Ian Stakenvicius <axs@gentoo.org> ipw2200-firmware-2.2.ebuild,
   ipw2200-firmware-2.4.ebuild, ipw2200-firmware-3.1.ebuild:
diff --git a/net-wireless/ipw2200-firmware/ipw2200-firmware-2.2.ebuild b/net-wireless/ipw2200-firmware/ipw2200-firmware-2.2.ebuild
index 7b8aff264679..0ab24131d4d3 100644
--- a/net-wireless/ipw2200-firmware/ipw2200-firmware-2.2.ebuild
+++ b/net-wireless/ipw2200-firmware/ipw2200-firmware-2.2.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/net-wireless/ipw2200-firmware/ipw2200-firmware-2.2.ebuild,v 1.7 2012/12/11 17:32:34 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200-firmware/ipw2200-firmware-2.2.ebuild,v 1.8 2013/01/21 22:30:40 ssuominen Exp $
 
 MY_P=${P/firmware/fw}
 S=${WORKDIR}
@@ -15,8 +15,7 @@ SLOT="${PV}"
 KEYWORDS="x86 ~amd64"
 
 IUSE=""
-DEPEND="|| ( virtual/udev >=sys-apps/hotplug-20040923 )
-	!<sys-fs/udev-096"
+DEPEND="virtual/udev"
 
 src_install() {
 	insinto /lib/firmware
diff --git a/net-wireless/ipw2200-firmware/ipw2200-firmware-3.1.ebuild b/net-wireless/ipw2200-firmware/ipw2200-firmware-3.1.ebuild
index b721868b2d88..2e44525a5e79 100644
--- a/net-wireless/ipw2200-firmware/ipw2200-firmware-3.1.ebuild
+++ b/net-wireless/ipw2200-firmware/ipw2200-firmware-3.1.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/net-wireless/ipw2200-firmware/ipw2200-firmware-3.1.ebuild,v 1.4 2012/12/11 17:32:34 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200-firmware/ipw2200-firmware-3.1.ebuild,v 1.5 2013/01/21 22:30:40 ssuominen Exp $
 
 MY_P=${P/firmware/fw}
 S=${WORKDIR}/${MY_P}
@@ -16,8 +16,7 @@ KEYWORDS="amd64 x86"
 
 IUSE=""
 DEPEND=""
-RDEPEND="|| ( virtual/udev >=sys-apps/hotplug-20040923 )
-	!<sys-fs/udev-096"
+RDEPEND="virtual/udev"
 
 src_install() {
 	insinto /lib/firmware