summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2005-01-12 05:17:16 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2005-01-12 05:17:16 +0000
commit0a64baa17a5a91ab3f31bf7fdb1810433e7b4a9a (patch)
tree5da6cc47392fae4e7ce2d7b9cd96d204c17ef6d9 /sys-libs
parentAdded linux-headers-2.6.8.1-r3.ebuild to correspond to l26-h-2.6.8.1-r3. (Man... (diff)
downloadgentoo-2-0a64baa17a5a91ab3f31bf7fdb1810433e7b4a9a.tar.gz
gentoo-2-0a64baa17a5a91ab3f31bf7fdb1810433e7b4a9a.tar.bz2
gentoo-2-0a64baa17a5a91ab3f31bf7fdb1810433e7b4a9a.zip
Changed linux26-headers depend to accept linux-headers-2.6 as well.
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/glibc/ChangeLog7
-rw-r--r--sys-libs/glibc/glibc-2.3.4.20040619-r2.ebuild4
-rw-r--r--sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild4
-rw-r--r--sys-libs/glibc/glibc-2.3.4.20041102.ebuild4
4 files changed, 12 insertions, 7 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index a5e441c8c342..6809699d30b3 100644
--- 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/glibc-2.3.4.20040619-r2.ebuild b/sys-libs/glibc/glibc-2.3.4.20040619-r2.ebuild
index 0eb66c52ebe1..7728f497d93b 100644
--- 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 85ce9547ca42..fd9f480b3fc0 100644
--- 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 81bcd3167fab..27dc2dfcb857 100644
--- 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