change all headers DEPENDs to virtual/os-headers

8 files changed, 20 insertions, 25 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 692340470ddd..4623cecd494b 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,11 +1,13 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.130 2004/02/24 17:33:38 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.131 2004/02/24 18:01:57 vapier Exp $
+
+  24 Feb 2004; Mike Frysinger <vapier@gentoo.org> :
+  Make the only headers info virtual/os-headers since hppa-headers PROVIDEs that.
 
   24 Feb 2004; Alexander Gabert <pappy@gentoo.org>
   glibc-2.3.3_pre20040207.ebuild:
   added GOTOFF fix from previous glibc release
-  fixed hppa behaviour to virtual/os-headers and hppa-headers
 
   23 Feb 2004; Martin Schlemmer <azarah@gentoo.org> glibc-2.3.2-r9.ebuild,
   files/2.3.2/glibc-2.3.2-ipv6-bytestring-fix.patch:
diff --git a/sys-libs/glibc/glibc-2.3.1-r5.ebuild b/sys-libs/glibc/glibc-2.3.1-r5.ebuild
index 05548fa7e809..d199554750f8 100644
--- a/sys-libs/glibc/glibc-2.3.1-r5.ebuild
+++ b/sys-libs/glibc/glibc-2.3.1-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.1-r5.ebuild,v 1.4 2004/02/24 17:33:38 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.1-r5.ebuild,v 1.5 2004/02/24 18:01:57 vapier Exp $
 
 IUSE="nls pic build"
 
@@ -52,9 +52,9 @@ LICENSE="LGPL-2"
 # Drobbins, 18 Mar 2002: we now rely on the system profile to select the correct linus-headers
 DEPEND=">=sys-devel/gcc-3.2
 	>=sys-devel/binutils-2.13.90.0.16
-	!hppa? ( virtual/os-headers )
+	virtual/os-headers
 	nls? ( sys-devel/gettext )"
-RDEPEND="!hppa? ( virtual/os-headers )
+RDEPEND="virtual/os-headers
 	sys-apps/baselayout
 	nls? ( sys-devel/gettext )
 	build? ( >=sys-apps/portage-1.9.0 )"
diff --git a/sys-libs/glibc/glibc-2.3.2-r9.ebuild b/sys-libs/glibc/glibc-2.3.2-r9.ebuild
index b490cf8700d5..0885639c68bf 100644
--- a/sys-libs/glibc/glibc-2.3.2-r9.ebuild
+++ b/sys-libs/glibc/glibc-2.3.2-r9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r9.ebuild,v 1.17 2004/02/24 17:33:38 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r9.ebuild,v 1.18 2004/02/24 18:01:57 vapier Exp $
 
 IUSE="nls pic build nptl"
 
@@ -64,11 +64,9 @@ LICENSE="LGPL-2"
 DEPEND=">=sys-devel/gcc-3.2.3-r1
 	x86? ( nptl? ( >=sys-devel/gcc-3.3.1-r1 ) )
 	>=sys-devel/binutils-2.14.90.0.6-r1
-	hppa? ( >=sys-kernel/hppa-headers-2.4.21_p13 )
-	!hppa? ( virtual/os-headers )
+	virtual/os-headers
 	nls? ( sys-devel/gettext )"
-
-RDEPEND="!hppa? ( virtual/os-headers )
+RDEPEND="virtual/os-headers
 	sys-apps/baselayout
 	nls? ( sys-devel/gettext )"
 
diff --git a/sys-libs/glibc/glibc-2.3.3_pre20031210.ebuild b/sys-libs/glibc/glibc-2.3.3_pre20031210.ebuild
index 3904e767ddb3..e11309dc8f79 100644
--- a/sys-libs/glibc/glibc-2.3.3_pre20031210.ebuild
+++ b/sys-libs/glibc/glibc-2.3.3_pre20031210.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.3_pre20031210.ebuild,v 1.2 2004/02/09 19:27:57 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.3_pre20031210.ebuild,v 1.3 2004/02/24 18:01:57 vapier Exp $
 
 IUSE="nls pic build nptl"
 
@@ -67,9 +67,8 @@ LICENSE="LGPL-2"
 DEPEND=">=sys-devel/gcc-3.2.3-r1
 	nptl? ( >=sys-devel/gcc-3.3.1-r1 )
 	>=sys-devel/binutils-2.14.90.0.6-r1
-	hppa? ( >=sys-kernel/hppa-headers-2.4.21_p13 ) : ( virtual/os-headers )
+	virtual/os-headers
 	nls? ( sys-devel/gettext )"
-
 RDEPEND="virtual/os-headers
 	sys-apps/baselayout
 	nls? ( sys-devel/gettext )"
diff --git a/sys-libs/glibc/glibc-2.3.3_pre20031222.ebuild b/sys-libs/glibc/glibc-2.3.3_pre20031222.ebuild
index e167b247d3c4..9ea1440b1244 100644
--- a/sys-libs/glibc/glibc-2.3.3_pre20031222.ebuild
+++ b/sys-libs/glibc/glibc-2.3.3_pre20031222.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.3_pre20031222.ebuild,v 1.5 2004/02/09 16:20:35 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.3_pre20031222.ebuild,v 1.6 2004/02/24 18:01:57 vapier Exp $
 
 IUSE="nls pic build nptl"
 
@@ -65,9 +65,8 @@ LICENSE="LGPL-2"
 DEPEND=">=sys-devel/gcc-3.2.3-r1
 	nptl? ( >=sys-devel/gcc-3.3.1-r1 )
 	>=sys-devel/binutils-2.14.90.0.6-r1
-	hppa? ( >=sys-kernel/hppa-headers-2.4.21_p13 ) : ( virtual/os-headers )
+	virtual/os-headers
 	nls? ( sys-devel/gettext )"
-
 RDEPEND="virtual/os-headers
 	sys-apps/baselayout
 	nls? ( sys-devel/gettext )"
diff --git a/sys-libs/glibc/glibc-2.3.3_pre20040117-r1.ebuild b/sys-libs/glibc/glibc-2.3.3_pre20040117-r1.ebuild
index 2348ba610a96..3cdbbbfafaf7 100644
--- a/sys-libs/glibc/glibc-2.3.3_pre20040117-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.3.3_pre20040117-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.3_pre20040117-r1.ebuild,v 1.2 2004/02/12 11:05:57 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.3_pre20040117-r1.ebuild,v 1.3 2004/02/24 18:01:57 vapier Exp $
 
 IUSE="nls pic build nptl"
 
@@ -66,9 +66,8 @@ LICENSE="LGPL-2"
 DEPEND=">=sys-devel/gcc-3.2.3-r1
 	nptl? ( >=sys-devel/gcc-3.3.1-r1 )
 	>=sys-devel/binutils-2.14.90.0.6-r1
-	hppa? ( >=sys-kernel/hppa-headers-2.4.21_p13 ) : ( virtual/os-headers )
+	virtual/os-headers
 	nls? ( sys-devel/gettext )"
-
 RDEPEND="virtual/os-headers
 	sys-apps/baselayout
 	nls? ( sys-devel/gettext )"
diff --git a/sys-libs/glibc/glibc-2.3.3_pre20040117.ebuild b/sys-libs/glibc/glibc-2.3.3_pre20040117.ebuild
index c5921efc585d..47137e00a17c 100644
--- a/sys-libs/glibc/glibc-2.3.3_pre20040117.ebuild
+++ b/sys-libs/glibc/glibc-2.3.3_pre20040117.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.3_pre20040117.ebuild,v 1.3 2004/02/09 16:20:35 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.3_pre20040117.ebuild,v 1.4 2004/02/24 18:01:57 vapier Exp $
 
 IUSE="nls pic build nptl"
 
@@ -65,9 +65,8 @@ LICENSE="LGPL-2"
 DEPEND=">=sys-devel/gcc-3.2.3-r1
 	nptl? ( >=sys-devel/gcc-3.3.1-r1 )
 	>=sys-devel/binutils-2.14.90.0.6-r1
-	hppa? ( >=sys-kernel/hppa-headers-2.4.21_p13 ) : ( virtual/os-headers )
+	virtual/os-headers
 	nls? ( sys-devel/gettext )"
-
 RDEPEND="virtual/os-headers
 	sys-apps/baselayout
 	nls? ( sys-devel/gettext )"
diff --git a/sys-libs/glibc/glibc-2.3.3_pre20040207.ebuild b/sys-libs/glibc/glibc-2.3.3_pre20040207.ebuild
index 8d0a9a100fec..3315088c878b 100644
--- a/sys-libs/glibc/glibc-2.3.3_pre20040207.ebuild
+++ b/sys-libs/glibc/glibc-2.3.3_pre20040207.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.3_pre20040207.ebuild,v 1.3 2004/02/24 17:33:38 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.3_pre20040207.ebuild,v 1.4 2004/02/24 18:01:57 vapier Exp $
 
 IUSE="nls pic build nptl"
 
@@ -65,9 +65,8 @@ LICENSE="LGPL-2"
 DEPEND=">=sys-devel/gcc-3.2.3-r1
 	nptl? ( >=sys-devel/gcc-3.3.1-r1 )
 	>=sys-devel/binutils-2.14.90.0.6-r1
-	hppa? ( >=sys-kernel/hppa-headers-2.4.21_p13 ) : ( virtual/os-headers )
+	virtual/os-headers
 	nls? ( sys-devel/gettext )"
-
 RDEPEND="virtual/os-headers
 	sys-apps/baselayout
 	nls? ( sys-devel/gettext )"