fixing linux-headers DEPEND for 2005.0. can we get away with a virtual?

7 files changed, 20 insertions, 13 deletions

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index b0789616657c..71b1a0f7088d 100644
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/hal
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.21 2005/01/09 21:19:44 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.22 2005/01/11 23:58:03 johnm Exp $
+
+  11 Jan 2005; John Mylchreest <johnm@gentoo.org> hal-0.2.98-r1.ebuild,
+  hal-0.4.1-r1.ebuild, hal-0.4.2-r1.ebuild, hal-0.4.4-r1.ebuild:
+  fixing linux-headers DEPEND for 2005.0. can we get away with a virtual?
 
 *hal-0.4.4-r1 (09 Jan 2005)
 
diff --git a/sys-apps/hal/hal-0.2.98-r1.ebuild b/sys-apps/hal/hal-0.2.98-r1.ebuild
index 738adcb7d7b8..c991f83ba1fb 100644
--- a/sys-apps/hal/hal-0.2.98-r1.ebuild
+++ b/sys-apps/hal/hal-0.2.98-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.2.98-r1.ebuild,v 1.4 2004/11/11 11:59:47 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.2.98-r1.ebuild,v 1.5 2005/01/11 23:58:03 johnm Exp $
 
 inherit eutils debug python
 
@@ -19,7 +19,7 @@ RDEPEND=">=dev-libs/glib-2.2.2
 	sys-fs/udev
 	sys-apps/hotplug
 	sys-libs/libcap
-	sys-kernel/linux26-headers"
+	|| ( >=sys-kernel/linux-sources-2.6 sys-kernel/linux26-headers )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
diff --git a/sys-apps/hal/hal-0.4.1-r1.ebuild b/sys-apps/hal/hal-0.4.1-r1.ebuild
index 8044402b7831..9d254fcdd798 100644
--- a/sys-apps/hal/hal-0.4.1-r1.ebuild
+++ b/sys-apps/hal/hal-0.4.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.4.1-r1.ebuild,v 1.5 2005/01/08 23:11:02 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.4.1-r1.ebuild,v 1.6 2005/01/11 23:58:03 johnm Exp $
 
 inherit eutils debug python
 
@@ -20,7 +20,7 @@ RDEPEND=">=dev-libs/glib-2.2.2
 	sys-apps/hotplug
 	sys-libs/libcap
 	>=sys-apps/util-linux-2.12i
-	sys-kernel/linux26-headers"
+	|| ( >=sys-kernel/linux-sources-2.6 sys-kernel/linux26-headers )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
diff --git a/sys-apps/hal/hal-0.4.2-r1.ebuild b/sys-apps/hal/hal-0.4.2-r1.ebuild
index 217b7e2cdb07..de29cd59dcec 100644
--- a/sys-apps/hal/hal-0.4.2-r1.ebuild
+++ b/sys-apps/hal/hal-0.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.4.2-r1.ebuild,v 1.2 2005/01/08 13:18:18 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.4.2-r1.ebuild,v 1.3 2005/01/11 23:58:03 johnm Exp $
 
 inherit eutils python
 
@@ -20,7 +20,7 @@ RDEPEND=">=dev-libs/glib-2.4
 	sys-apps/hotplug
 	sys-libs/libcap
 	>=sys-apps/util-linux-2.12i
-	sys-kernel/linux26-headers"
+	|| ( >=sys-kernel/linux-sources-2.6 sys-kernel/linux26-headers )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
diff --git a/sys-apps/hal/hal-0.4.4-r1.ebuild b/sys-apps/hal/hal-0.4.4-r1.ebuild
index 9bcd56197a6b..3cf6df0bc22c 100644
--- a/sys-apps/hal/hal-0.4.4-r1.ebuild
+++ b/sys-apps/hal/hal-0.4.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.4.4-r1.ebuild,v 1.1 2005/01/09 21:19:44 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.4.4-r1.ebuild,v 1.2 2005/01/11 23:58:03 johnm Exp $
 
 inherit eutils python
 
@@ -21,7 +21,7 @@ RDEPEND=">=dev-libs/glib-2.4
 	sys-libs/libcap
 	dev-libs/popt
 	>=sys-apps/util-linux-2.12i
-	sys-kernel/linux26-headers"
+	|| ( >=sys-kernel/linux-sources-2.6 sys-kernel/linux26-headers )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
diff --git a/sys-apps/raidutils/ChangeLog b/sys-apps/raidutils/ChangeLog
index 0a03fe991500..7543a96368a5 100644
--- a/sys-apps/raidutils/ChangeLog
+++ b/sys-apps/raidutils/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/raidutils
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/raidutils/ChangeLog,v 1.1 2005/01/10 21:59:01 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/raidutils/ChangeLog,v 1.2 2005/01/12 00:02:00 johnm Exp $
+
+  12 Jan 2005; John Mylchreest <johnm@gentoo.org> raidutils-0.0.5.ebuild:
+  fixing linux-headers DEPEND for 2005.0. can we get away with a virtual?
 
 *raidutils-0.0.5 (10 Jan 2005)
 
diff --git a/sys-apps/raidutils/raidutils-0.0.5.ebuild b/sys-apps/raidutils/raidutils-0.0.5.ebuild
index 7815041e8a9d..bc6b7d72708d 100644
--- a/sys-apps/raidutils/raidutils-0.0.5.ebuild
+++ b/sys-apps/raidutils/raidutils-0.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/raidutils/raidutils-0.0.5.ebuild,v 1.1 2005/01/10 21:59:01 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/raidutils/raidutils-0.0.5.ebuild,v 1.2 2005/01/12 00:02:00 johnm Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ IUSE=""
 SLOT="0"
 LICENSE="Adaptec"
 
-DEPEND="sys-kernel/linux26-headers"
+DEPEND="|| ( >=sys-kernel/linux-sources-2.6 sys-kernel/linux26-headers )"
 RDEPEND=""
 
 src_unpack () {