Bug #405687: Depend on virtual/modutils instead of sys-apps/module-init-tools.

Package-Manager: portage-2.2.0_alpha87/cvs/Linux x86_64

8 files changed, 30 insertions, 22 deletions

diff --git a/sys-apps/hwdata-redhat/ChangeLog b/sys-apps/hwdata-redhat/ChangeLog
index 5701069b0d45..1c6d90ef16da 100644
--- a/sys-apps/hwdata-redhat/ChangeLog
+++ b/sys-apps/hwdata-redhat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/hwdata-redhat
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwdata-redhat/ChangeLog,v 1.6 2011/12/21 08:16:22 floppym Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwdata-redhat/ChangeLog,v 1.7 2012/02/25 06:45:07 robbat2 Exp $
+
+  25 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> hwdata-redhat-0.187.ebuild,
+  hwdata-redhat-0.217.ebuild:
+  Bug #405687: Depend on virtual/modutils instead of sys-apps/module-init-tools.
 
   21 Dec 2011; Mike Gilbert <floppym@gentoo.org>
   +files/hwdata-redhat-0.217-python-3.patch, hwdata-redhat-0.217.ebuild:
diff --git a/sys-apps/hwdata-redhat/hwdata-redhat-0.187.ebuild b/sys-apps/hwdata-redhat/hwdata-redhat-0.187.ebuild
index 3a72228edec5..29b0dc2a14a9 100644
--- a/sys-apps/hwdata-redhat/hwdata-redhat-0.187.ebuild
+++ b/sys-apps/hwdata-redhat/hwdata-redhat-0.187.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwdata-redhat/hwdata-redhat-0.187.ebuild,v 1.2 2006/09/08 19:35:47 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwdata-redhat/hwdata-redhat-0.187.ebuild,v 1.3 2012/02/25 06:45:07 robbat2 Exp $
 
 inherit flag-o-matic rpm
 
@@ -16,7 +16,7 @@ LICENSE="GPL-2 MIT"
 SLOT="0"
 KEYWORDS="~ppc ~ppc64 ~x86"
 IUSE=""
-RDEPEND=">=sys-apps/module-init-tools-3.2
+RDEPEND="virtual/modutils
 	!sys-apps/hwdata-gentoo"
 DEPEND="${RDEPEND}"
 S="${WORKDIR}/${MY_P}"
diff --git a/sys-apps/hwdata-redhat/hwdata-redhat-0.217.ebuild b/sys-apps/hwdata-redhat/hwdata-redhat-0.217.ebuild
index ff3edd25b963..c40729e6c0ec 100644
--- a/sys-apps/hwdata-redhat/hwdata-redhat-0.217.ebuild
+++ b/sys-apps/hwdata-redhat/hwdata-redhat-0.217.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwdata-redhat/hwdata-redhat-0.217.ebuild,v 1.2 2011/12/21 08:16:22 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwdata-redhat/hwdata-redhat-0.217.ebuild,v 1.3 2012/02/25 06:45:07 robbat2 Exp $
 
 inherit eutils flag-o-matic rpm
 
@@ -18,7 +18,7 @@ LICENSE="GPL-2 MIT"
 SLOT="0"
 KEYWORDS="~ppc ~ppc64 ~x86 ~amd64"
 IUSE="test"
-RDEPEND=">=sys-apps/module-init-tools-3.2
+RDEPEND="virtual/modutils
 	!sys-apps/hwdata-gentoo"
 DEPEND="${RDEPEND}
 	test? ( sys-apps/pciutils )"
diff --git a/sys-apps/pcmciautils/ChangeLog b/sys-apps/pcmciautils/ChangeLog
index 746f94eff85c..f577182d88f8 100644
--- a/sys-apps/pcmciautils/ChangeLog
+++ b/sys-apps/pcmciautils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/pcmciautils
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/ChangeLog,v 1.37 2010/05/26 10:16:17 bangert Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/ChangeLog,v 1.38 2012/02/25 06:43:55 robbat2 Exp $
+
+  25 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> pcmciautils-014-r1.ebuild,
+  pcmciautils-015.ebuild, pcmciautils-016.ebuild, pcmciautils-017.ebuild:
+  Bug #405687: Depend on virtual/modutils instead of sys-apps/module-init-tools.
 
 *pcmciautils-017 (26 May 2010)
 
diff --git a/sys-apps/pcmciautils/pcmciautils-014-r1.ebuild b/sys-apps/pcmciautils/pcmciautils-014-r1.ebuild
index 6af05a175e57..502269f7748f 100644
--- a/sys-apps/pcmciautils/pcmciautils-014-r1.ebuild
+++ b/sys-apps/pcmciautils/pcmciautils-014-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/pcmciautils-014-r1.ebuild,v 1.9 2009/10/16 19:19:38 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/pcmciautils-014-r1.ebuild,v 1.10 2012/02/25 06:43:55 robbat2 Exp $
 
 inherit eutils toolchain-funcs linux-info
 
@@ -15,7 +15,7 @@ KEYWORDS="amd64 arm ppc sh x86"
 
 IUSE="debug static staticsocket"
 RDEPEND=">=sys-fs/sysfsutils-1.2.0-r1
-	>=sys-apps/module-init-tools-3.2_pre4"
+	virtual/modutils"
 DEPEND="${RDEPEND}
 	dev-util/yacc
 	sys-devel/flex
diff --git a/sys-apps/pcmciautils/pcmciautils-015.ebuild b/sys-apps/pcmciautils/pcmciautils-015.ebuild
index 5f93282c2908..6a9c1a67bf60 100644
--- a/sys-apps/pcmciautils/pcmciautils-015.ebuild
+++ b/sys-apps/pcmciautils/pcmciautils-015.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/pcmciautils-015.ebuild,v 1.3 2009/10/16 19:19:38 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/pcmciautils-015.ebuild,v 1.4 2012/02/25 06:43:55 robbat2 Exp $
 
 inherit eutils flag-o-matic toolchain-funcs linux-info
 
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~arm ~ppc ~sh ~x86"
 IUSE="debug static staticsocket"
 
 RDEPEND=">=sys-fs/sysfsutils-1.2.0-r1
-	>=sys-apps/module-init-tools-3.2_pre4"
+	virtual/modutils"
 DEPEND="${RDEPEND}
 	dev-util/yacc
 	sys-devel/flex"
diff --git a/sys-apps/pcmciautils/pcmciautils-016.ebuild b/sys-apps/pcmciautils/pcmciautils-016.ebuild
index 62b7df29107f..299204a5efda 100644
--- a/sys-apps/pcmciautils/pcmciautils-016.ebuild
+++ b/sys-apps/pcmciautils/pcmciautils-016.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/pcmciautils-016.ebuild,v 1.1 2009/10/16 19:19:38 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/pcmciautils-016.ebuild,v 1.2 2012/02/25 06:43:55 robbat2 Exp $
 
 inherit eutils flag-o-matic toolchain-funcs linux-info
 
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~arm ~ppc ~sh ~x86"
 IUSE="debug static staticsocket"
 
 RDEPEND=">=sys-fs/sysfsutils-1.3.0
-	>=sys-apps/module-init-tools-3.2_pre4"
+	virtual/modutils"
 DEPEND="${RDEPEND}
 	dev-util/yacc
 	sys-devel/flex"
diff --git a/sys-apps/pcmciautils/pcmciautils-017.ebuild b/sys-apps/pcmciautils/pcmciautils-017.ebuild
index 1a18d7803140..a5df30dd8cd2 100644
--- a/sys-apps/pcmciautils/pcmciautils-017.ebuild
+++ b/sys-apps/pcmciautils/pcmciautils-017.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/pcmciautils-017.ebuild,v 1.1 2010/05/26 10:16:17 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/pcmciautils-017.ebuild,v 1.2 2012/02/25 06:43:55 robbat2 Exp $
 
 inherit eutils flag-o-matic toolchain-funcs linux-info
 
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~arm ~ppc ~sh ~x86"
 IUSE="debug static staticsocket"
 
 RDEPEND=">=sys-fs/sysfsutils-1.3.0
-	>=sys-apps/module-init-tools-3.2_pre4"
+	virtual/modutils"
 DEPEND="${RDEPEND}
 	dev-util/yacc
 	sys-devel/flex"