Changed linux26-headers depend to accept linux-headers-2.6 as well.

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index a5e441c8c342d0ca97ae98da179edf45e68d9a7d..6809699d30b356b24bc1b578195079096ab5950c 100644 (file)
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.303 2005/01/11 22:25:44 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.304 2005/01/12 05:17:16 eradicator Exp $
+
+  11 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  glibc-2.3.4.20040619-r2.ebuild, glibc-2.3.4.20040808-r1.ebuild,
+  glibc-2.3.4.20041102.ebuild:
+  Changed linux26-headers depend to accept linux-headers-2.6 as well.
 
   11 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
   glibc-2.3.4.20040808-r1.ebuild, glibc-2.3.4.20041102.ebuild:

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 3630e3fd3a32d74b6493c73e90c4a990eded8e08..323bcc62cad6e1cd81cf702b1dec0f89f292a290 100644 (file)
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 ec1c31d4c2e13a30a63d80c49520e950 ChangeLog 64311
+MD5 7b98294531dddc123cc943ab7dfd160a ChangeLog 64536
 MD5 5529417ce5503c488b1ccaaa2e781799 glibc-2.2.5-r9.ebuild 10915
 MD5 3b44d39389334d36b42c51887729dd4d glibc-2.3.2-r12.ebuild 21817
 MD5 39ac6b0f30c9c27a5cd04c4e0b6caadb glibc-2.3.3.20040420-r2.ebuild 21634
-MD5 fb1164e647c67c71636062c61f2df7cd glibc-2.3.4.20040808-r1.ebuild 26388
-MD5 a21f9597360062fd6e58bd4f34d2812b glibc-2.3.4.20041102.ebuild 31368
+MD5 96cbc820779b9cb49b6e8d872ae1ac8f glibc-2.3.4.20040808-r1.ebuild 26428
+MD5 517224351cbc845052accd75dea4ee28 glibc-2.3.4.20041102.ebuild 31408
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
-MD5 e4c399efc30efc54fb478b897cd37149 glibc-2.3.4.20040619-r2.ebuild 21078
+MD5 acdb3de3aea67da2c33bf5ae3ca10622 glibc-2.3.4.20040619-r2.ebuild 21116
 MD5 9cc1e6b6f749dba7c8759bd07266f7d9 files/digest-glibc-2.2.5-r9 143
 MD5 2d5306ef875573750af642a9f93b634a files/digest-glibc-2.3.2-r12 312
 MD5 42af7e35fe2404a49954f91fd1aee891 files/digest-glibc-2.3.3.20040420-r2 312
@@ -139,7 +139,7 @@ MD5 b72e5aca6d834026a6f5fb87623e6fd3 files/2.3.4/host.conf 1302
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFB5JM/ArHZZzCEUG0RAolrAJ9i0ma8ZdbcC7G5K268/47PHbqxYwCcCjJF
-87C8qclgDwlvo0//Mmj6Lgo=
-=xmZH
+iD8DBQFB5LMFArHZZzCEUG0RAiVoAJ98w/6VF6Ic08dVhz3mSj7PY12ZjACdHE9A
+J14e+1jPeQGS1042R2th1CU=
+=I0mQ
 -----END PGP SIGNATURE-----

diff --git a/sys-libs/glibc/glibc-2.3.4.20040619-r2.ebuild b/sys-libs/glibc/glibc-2.3.4.20040619-r2.ebuild
index 0eb66c52ebe18be4ed6f2b80618e1a86cb7b1e19..7728f497d93bd25725a65557ed38f1e503257339 100644 (file)
--- a/sys-libs/glibc/glibc-2.3.4.20040619-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20040619-r2.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-libs/glibc/glibc-2.3.4.20040619-r2.ebuild,v 1.5 2005/01/05 01:53:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040619-r2.ebuild,v 1.6 2005/01/12 05:17:16 eradicator Exp $
 
 inherit eutils flag-o-matic gcc
 
@@ -56,7 +56,7 @@ 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
        virtual/os-headers
-       nptl? ( =sys-kernel/linux26-headers-2.6* )
+       nptl? ( || ( >=sys-kernel/linux-headers-2.6.0 sys-kernel/linux26-headers ) )
        nls? ( sys-devel/gettext )"
 RDEPEND="virtual/os-headers
        sys-apps/baselayout

diff --git a/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild b/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild
index 85ce9547ca420970247dae8e8fc0eb687375c56e..fd9f480b3fc03071bbe51da289d13017ddb8ad03 100644 (file)
--- a/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20040808-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-libs/glibc/glibc-2.3.4.20040808-r1.ebuild,v 1.30 2005/01/12 03:00:37 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild,v 1.31 2005/01/12 05:17:16 eradicator Exp $
 
 inherit eutils flag-o-matic gcc versionator
 
@@ -64,7 +64,7 @@ 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
        virtual/os-headers
-       nptl? ( >=sys-kernel/linux26-headers-2.6.5 )
+       nptl? ( || ( >=sys-kernel/linux-headers-2.6.5 >=sys-kernel/linux26-headers-2.6.5 ) )
        nls? ( sys-devel/gettext )"
 RDEPEND="virtual/os-headers
        sys-apps/baselayout

diff --git a/sys-libs/glibc/glibc-2.3.4.20041102.ebuild b/sys-libs/glibc/glibc-2.3.4.20041102.ebuild
index 81bcd3167fabb61fbe0eac9c076cc54b6c47f6c4..27dc2dfcb857955bdcbffd0fd9412bdf3e4a6e77 100644 (file)
--- a/sys-libs/glibc/glibc-2.3.4.20041102.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20041102.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-libs/glibc/glibc-2.3.4.20041102.ebuild,v 1.24 2005/01/12 03:00:37 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20041102.ebuild,v 1.25 2005/01/12 05:17:16 eradicator Exp $
 
 inherit eutils flag-o-matic gcc versionator
 
@@ -64,7 +64,7 @@ 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
        virtual/os-headers
-       nptl? ( >=sys-kernel/linux26-headers-2.6.5 )
+       nptl? ( || ( >=sys-kernel/linux-headers-2.6.5 >=sys-kernel/linux26-headers-2.6.5 ) )
        nls? ( sys-devel/gettext )"
 RDEPEND="virtual/os-headers
        sys-apps/baselayout