*** empty log message ***

10 files changed, 40 insertions, 30 deletions

diff --git a/sys-devel/bin86/bin86-0.15.4.ebuild b/sys-devel/bin86/bin86-0.15.4.ebuild
index 5005be222673..38516031304f 100644
--- a/sys-devel/bin86/bin86-0.15.4.ebuild
+++ b/sys-devel/bin86/bin86-0.15.4.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/bin86/bin86-0.15.4.ebuild,v 1.2 2000/11/30 23:15:06 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bin86/bin86-0.15.4.ebuild,v 1.3 2001/01/31 20:49:07 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/bin86
 DESCRIPTION="Assembler and loader used to create kernel bootsector"
 SRC_URI="http://www.cix.co.uk/~mayday/${A}"
 HOMEPAGE="http://www.cix.co.uk/~mayday/"
-DEPEND=">=sys-libs/glibc-2.1.3"
+DEPEND="virtual/glibc"
 RDEPEND="$DEPEND
 	 >=sys-apps/bash-2.04"
 
diff --git a/sys-devel/binutils/binutils-2.10.1.ebuild b/sys-devel/binutils/binutils-2.10.1.ebuild
index f140381b2dfd..790c601a1d8c 100644
--- a/sys-devel/binutils/binutils-2.10.1.ebuild
+++ b/sys-devel/binutils/binutils-2.10.1.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.10.1.ebuild,v 1.3 2001/01/27 14:41:34 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.10.1.ebuild,v 1.4 2001/01/31 20:49:07 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Tools necessary to build programs"
 SRC_URI="ftp://ftp.gnu.org/gnu/binutils/${A}"
-DEPEND=">=sys-libs/glibc-2.1.3"
+DEPEND="virtual/glibc
+       || ( sys-devel/flex sys-build/flex )"
 
 src_compile() {                           
 	try ./configure --prefix=/usr --host=${CHOST}
diff --git a/sys-devel/bison/bison-1.28-r1.ebuild b/sys-devel/bison/bison-1.28-r1.ebuild
index ee04330f14bd..5a344d884b94 100644
--- a/sys-devel/bison/bison-1.28-r1.ebuild
+++ b/sys-devel/bison/bison-1.28-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/bison/bison-1.28-r1.ebuild,v 1.7 2000/12/19 00:43:28 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bison/bison-1.28-r1.ebuild,v 1.8 2001/01/31 20:49:07 achim Exp $
 
 P=bison-1.28      
 A=${P}.tar.gz
@@ -10,7 +10,7 @@ DESCRIPTION="A yacc-compatible parser generator"
 SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/bison/${A}
 	 ftp://prep.ai.mit.edu/gnu/bison/${A}"
 HOMEPAGE="http://www.gnu.org/software/bison/bison.html"
-DEPEND=">=sys-libs/glibc-2.1.3"
+DEPEND="virtual/glibc"
 src_compile() {                           
     try ./configure --prefix=/usr --datadir=/usr/share/bison --host=${CHOST}
     try make ${MAKEOPTS}
diff --git a/sys-devel/flex/flex-2.5.4a-r1.ebuild b/sys-devel/flex/flex-2.5.4a-r1.ebuild
index ebeda09e5b3f..18bb569a1a90 100644
--- a/sys-devel/flex/flex-2.5.4a-r1.ebuild
+++ b/sys-devel/flex/flex-2.5.4a-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/flex-2.5.4a-r1.ebuild,v 1.5 2000/11/30 23:15:06 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/flex-2.5.4a-r1.ebuild,v 1.6 2001/01/31 20:49:07 achim Exp $
 
 P=flex-2.5.4a      
 A=${P}.tar.gz
@@ -10,7 +10,11 @@ DESCRIPTION="GNU lexical analyser generator"
 SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/non-gnu/flex/${A}
 	 ftp://prep.ai.mit.edu/non-gnu/flex/${A}"
 HOMEPAGE="http://www.gnu.org/software/flex/flex.html"
-DEPEND=">=sys-libs/glibc-2.1.3"
+
+DEPEND="virtual/glibc
+        sys-devel/bison"
+
+RDEPEND="virtual/glibc"
 
 src_compile() {                           
     try ./configure --prefix=/usr --host=${CHOST}
diff --git a/sys-devel/gcc/gcc-2.95.2-r4.ebuild b/sys-devel/gcc/gcc-2.95.2-r4.ebuild
index 0945b7083c11..84a527546087 100644
--- a/sys-devel/gcc/gcc-2.95.2-r4.ebuild
+++ b/sys-devel/gcc/gcc-2.95.2-r4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-2.95.2-r4.ebuild,v 1.4 2001/01/27 14:41:34 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-2.95.2-r4.ebuild,v 1.5 2001/01/31 20:49:07 achim Exp $
 
 P=gcc-2.95.2
 A="gcc-2.95.2.tar.gz 
@@ -20,7 +20,7 @@ T=/usr
 
 DESCRIPTION="modern gcc c/c++ compiler"
 
-SRC_URI="ftp://prep.ai.mit.edu/gnu/gcc/gcc-2.95.2.tar.gz 
+SRC_URI="ftp://prep.ai.mit.edu/gnu/gcc/gcc-2.95.2.tar.gz
 	 ftp://gatekeeper.dec.com/pub/GNU/gcc/gcc-2.95.2.tar.gz 
 	 ftp://sourceware.cygnus.com/pub/gcc/infrastructure/libg++-2.8.1.3.tar.gz
 	 ftp://sourceware.cygnus.com/pub/gcc/infrastructure/libg++-2.8.1.3-20000816.diff.gz
@@ -31,9 +31,12 @@ SRC_URI="ftp://prep.ai.mit.edu/gnu/gcc/gcc-2.95.2.tar.gz
          ftp://ftp.freesoftware.com/pub/sourceware/gcc/infrastructure/libg++-2.8.1.3-20000914.diff.gz"
 
 HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
-DEPEND=">=sys-libs/glibc-2.1.3"
-RDEPEND="$DEPEND
-	 >=sys-apps/bash-2.04"
+DEPEND="virtual/glibc
+        >=sys-devel/gettext-0.10.35-r1
+        || ( sys-devel/flex sys-build/flex )"
+
+RDEPEND="virtual/glibc
+	 sys-apps/bash"
 
 src_unpack() {
     unpack gcc-2.95.2.tar.gz
@@ -54,7 +57,7 @@ src_unpack() {
     patch -p0 < ${FILESDIR}/${A3}
 }
 
-src_compile() {                           
+src_compile() {
 	cd ${S}
 	#i586a doesn't like optimization?
 	if [ "$PLATFORM" == "i686-pc-linux-gnu" ]
@@ -65,12 +68,12 @@ src_compile() {
 	try ${S}/configure --prefix=${T} --enable-version-specific-runtime-libs \
 		       --host=${CHOST} --enable-threads --enable-shared \
 		        --with-local-prefix=${T}/local --enable-nls
-	# Parallel build does not work				       
+	# Parallel build does not work
 	try make ${MAKEOPTS} bootstrap-lean
 }
 
-src_install() { 
-  
+src_install() {
+
 	try make install prefix=${D}${T} mandir=${D}${T}/man
         FULLPATH=${D}${T}/lib/gcc-lib/${CHOST}/${PV}
 	cd ${FULLPATH}
diff --git a/sys-devel/gettext/gettext-0.10.35-r1.ebuild b/sys-devel/gettext/gettext-0.10.35-r1.ebuild
index 983fe4fbe3d6..c91dacc07c8a 100644
--- a/sys-devel/gettext/gettext-0.10.35-r1.ebuild
+++ b/sys-devel/gettext/gettext-0.10.35-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.10.35-r1.ebuild,v 1.1 2000/11/30 23:15:06 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.10.35-r1.ebuild,v 1.2 2001/01/31 20:49:07 achim Exp $
 
 P=gettext-0.10.35      
 A=${P}.tar.gz
@@ -11,10 +11,11 @@ SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/gettext/${A}
 	 ftp://prep.ai.mit.edu/gnu/gettext/${A}"
 HOMEPAGE="http://www.gnu.org/software/gettext/gettext.html"
 
-DEPEND=">=sys-libs/glibc-2.1.3"
+DEPEND="virtual/glibc
+        || ( sys-devel/bison sys-build/bison )"
 
-RDEPEND="$DEPEND
-	 >=sys-apps/bash-2.04"
+RDEPEND="virtual/glibc
+        || ( sys-apps/bash sys-build/bash )"
 
 src_compile() {                           
 	try ./configure --prefix=/usr --with-included-gettext --host=${CHOST}
diff --git a/sys-devel/libtool/libtool-1.3.5-r1.ebuild b/sys-devel/libtool/libtool-1.3.5-r1.ebuild
index 3fce59d02ac1..e1279d17538b 100644
--- a/sys-devel/libtool/libtool-1.3.5-r1.ebuild
+++ b/sys-devel/libtool/libtool-1.3.5-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.3.5-r1.ebuild,v 1.5 2000/11/30 23:15:06 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.3.5-r1.ebuild,v 1.6 2001/01/31 20:49:07 achim Exp $
 
 P=libtool-1.3.5
 A=${P}.tar.gz
@@ -10,9 +10,9 @@ DESCRIPTION="A shared library tool for developers"
 SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/libtool/${A}
 	 ftp://prep.ai.mit.edu/gnu/libtool/${A}"
 HOMEPAGE="http://www.gnu.org/software/libtool/libtool.html"
-DEPEND=">=sys-libs/glibc-2.1.3"
+DEPEND="virtual/glibc"
 RDEPEND="$DEPEND
-	 >=sys-apps/bash-2.04"
+	 sys-apps/bash"
 
 src_compile() {
 	try ./configure --prefix=/usr --host=${CHOST}
diff --git a/sys-devel/m4/m4-1.4o-r2.ebuild b/sys-devel/m4/m4-1.4o-r2.ebuild
index 8bc0fb686f83..2421b7667713 100644
--- a/sys-devel/m4/m4-1.4o-r2.ebuild
+++ b/sys-devel/m4/m4-1.4o-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/m4-1.4o-r2.ebuild,v 1.1 2001/01/18 22:00:38 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/m4-1.4o-r2.ebuild,v 1.2 2001/01/31 20:49:07 achim Exp $
 
 P=m4-1.4o      
 A=${P}.tar.gz
@@ -9,7 +9,8 @@ S=${WORKDIR}/${P}
 DESCRIPTION="GNU macro processor"
 SRC_URI="ftp://ftp.seindal.dk/gnu/${A}"
 HOMEPAGE="http://www.gnu.org/software/m4/m4.html"
-DEPEND=">=sys-libs/glibc-2.1.3"
+DEPEND="virtual/glibc
+        >=sys-devel/libtool-1.3.5-r1"
 
 src_compile() {                           
     try ./configure --prefix=/usr --libexecdir=/usr/lib --with-modules --host=${CHOST}
diff --git a/sys-devel/make/make-3.79.1-r1.ebuild b/sys-devel/make/make-3.79.1-r1.ebuild
index 7ad7c3b0d397..212c049b1e91 100644
--- a/sys-devel/make/make-3.79.1-r1.ebuild
+++ b/sys-devel/make/make-3.79.1-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/make-3.79.1-r1.ebuild,v 1.5 2000/11/30 23:15:06 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/make-3.79.1-r1.ebuild,v 1.6 2001/01/31 20:49:07 achim Exp $
 
 P=make-3.79.1
 A=${P}.tar.gz
@@ -10,7 +10,7 @@ DESCRIPTION="Standard tool to compile source trees"
 SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/make/${A}
 	 ftp://prep.ai.mit.edu/gnu/make/${A}"
 HOMEPAGE="http://www.gnu.org/software/make/make.html"
-DEPEND=">=sys-libs/glibc-2.1.3"
+DEPEND="virtual/glibc"
 
 src_compile() {                           
 	try ./configure --prefix=/usr --host=${CHOST}
diff --git a/sys-devel/patch/patch-2.5.4-r1.ebuild b/sys-devel/patch/patch-2.5.4-r1.ebuild
index 60e0bb49a491..e8b03536de71 100644
--- a/sys-devel/patch/patch-2.5.4-r1.ebuild
+++ b/sys-devel/patch/patch-2.5.4-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/patch/patch-2.5.4-r1.ebuild,v 1.5 2000/11/30 23:15:06 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/patch/patch-2.5.4-r1.ebuild,v 1.6 2001/01/31 20:49:07 achim Exp $
 
 P=patch-2.5.4      
 A=${P}.tar.gz
@@ -10,7 +10,7 @@ DESCRIPTION="Utility to apply diffs to files"
 SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/patch/${A}
 	 ftp://ftp.gnu.org/gnu/patch/${A}"
 HOMEPAGE="http://www.gnu.org/software/patch/patch.html"
-DEPEND=">=sys-libs/glibc-2.1.3"
+DEPEND="virtual/glibc"
 
 src_compile() {                           
 	try ./configure --host=${CHOST} --prefix=/usr