Upd and fixes for sys-build

22 files changed, 54 insertions, 40 deletions

diff --git a/app-admin/modlogan/modlogan-0.5.7.ebuild b/app-admin/modlogan/modlogan-0.5.7.ebuild
index b64ad263fa76..9f4b0d0ffd8c 100644
--- a/app-admin/modlogan/modlogan-0.5.7.ebuild
+++ b/app-admin/modlogan/modlogan-0.5.7.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/app-admin/modlogan/modlogan-0.5.7.ebuild,v 1.3 2001/01/19 20:30:16 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/modlogan/modlogan-0.5.7.ebuild,v 1.4 2001/01/27 14:41:33 achim Exp $
 
 A="${P}.tar.gz gd-1.8.1.tar.gz"
 S=${WORKDIR}/${P}
@@ -48,7 +48,7 @@ src_install() {
   newins ${FILESDIR}/sample.def.conf modlogan.def.conf.sample
   doins doc/modlogan.searchengines
   insinto /etc/httpd
-  doins ${FILESDIR}/modlogan.conf
+  newins ${FILESDIR}/modlogan.conf httpd.modlogan
   dodir /usr/local/httpd/modlogan
   preplib /usr
   dodoc AUTHORS COPYING ChangeLog README NEWS TODO
diff --git a/app-arch/dump/dump-0.4.21.ebuild b/app-arch/dump/dump-0.4.21.ebuild
index 64338aaf7c2d..5dbb6b38d076 100644
--- a/app-arch/dump/dump-0.4.21.ebuild
+++ b/app-arch/dump/dump-0.4.21.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/app-arch/dump/dump-0.4.21.ebuild,v 1.1 2001/01/14 05:36:19 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dump/dump-0.4.21.ebuild,v 1.2 2001/01/27 14:41:33 achim Exp $
 
 P=dump-0.4b21
 A=${P}.tar.gz
@@ -10,6 +10,7 @@ DESCRIPTION="Dump/restore ext2fs backup utilities"
 SRC_URI="http://download.sourceforge.net/dump/${A}"
 HOMEPAGE="http://dump.sourceforge.net"
 
+DEPEND=">=sys-apps/e2fsprogs-1.19"
 
 src_compile() {
 
diff --git a/dev-db/postgresql/postgresql-7.0.3-r1.ebuild b/dev-db/postgresql/postgresql-7.0.3-r1.ebuild
index 6b019eab763b..3307f58d3e73 100644
--- a/dev-db/postgresql/postgresql-7.0.3-r1.ebuild
+++ b/dev-db/postgresql/postgresql-7.0.3-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/dev-db/postgresql/postgresql-7.0.3-r1.ebuild,v 1.4 2001/01/23 19:54:43 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.0.3-r1.ebuild,v 1.5 2001/01/27 14:41:33 achim Exp $
 
 #P=
 A=${P}.tar.gz
@@ -10,11 +10,13 @@ DESCRIPTION="PostgreSQL is a sophisticated Object-Relational DBMS"
 SRC_URI="ftp://ftp.postgresql.org/pub/v7.0.3/${A}"
 HOMEPAGE="http://postgresql.readysetnet.com/"
 
+DEPEND=">=dev-lang/tcl-tk-8"
+
 src_unpack() {
   unpack ${A}
   cd ${S}/backend/catalog
   cp genbki.sh.in genbki.sh.orig
-  sed -e 's:\\name:\\ name:' genbki.sh.orig > genbki.sh.in
+  sed -e 's:\\name:name:' genbki.sh.orig > genbki.sh.in
 }
 
 src_compile() {
diff --git a/dev-db/postgresql/postgresql-7.1_beta3.ebuild b/dev-db/postgresql/postgresql-7.1_beta3.ebuild
index a75bcb6c7303..7cadc9af31ab 100644
--- a/dev-db/postgresql/postgresql-7.1_beta3.ebuild
+++ b/dev-db/postgresql/postgresql-7.1_beta3.ebuild
@@ -10,6 +10,8 @@ DESCRIPTION="PostgreSQL is a sophisticated Object-Relational DBMS"
 SRC_URI="ftp://ftp.postgresql.org/pub/dev/${A}"
 HOMEPAGE="http://postgresql.readysetnet.com/"
 
+DEPEND=">=dev-lang/tcl-tk-8"
+
 src_unpack() {
   unpack ${A}
   cd ${S}/src/backend/catalog
diff --git a/dev-perl/GD/GD-1.19.ebuild b/dev-perl/GD/GD-1.19.ebuild
index 15545785bc41..2387aeba2609 100644
--- a/dev-perl/GD/GD-1.19.ebuild
+++ b/dev-perl/GD/GD-1.19.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/dev-perl/GD/GD-1.19.ebuild,v 1.1 2001/01/23 06:17:49 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/GD/GD-1.19.ebuild,v 1.2 2001/01/27 14:41:33 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -11,12 +11,13 @@ SRC_URI="http://www.cpan.org/modules/by-module/GD/${A}"
 HOMEPAGE="http://www.cpan.org/modules/by-module/GD/${P}.readme"
 
 DEPEND=">=sys-devel/perl-5"
+RDEPEND="$DEPEND"
 
 src_compile() {
     cd ${S}
     perl Makefile.PL
     try make
-    #try make test
+    try make test
 }
 
 src_install () {
diff --git a/dev-perl/Msql-Mysql-modules/Msql-Mysql-modules-1.2215.ebuild b/dev-perl/Msql-Mysql-modules/Msql-Mysql-modules-1.2215.ebuild
index 3eedb37a037a..a88d32d3ef33 100644
--- a/dev-perl/Msql-Mysql-modules/Msql-Mysql-modules-1.2215.ebuild
+++ b/dev-perl/Msql-Mysql-modules/Msql-Mysql-modules-1.2215.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/dev-perl/Msql-Mysql-modules/Msql-Mysql-modules-1.2215.ebuild,v 1.1 2001/01/23 06:17:49 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Msql-Mysql-modules/Msql-Mysql-modules-1.2215.ebuild,v 1.2 2001/01/27 14:41:33 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -13,6 +13,7 @@ HOMEPAGE="http://www.cpan.org/modules/by-module/Msql/${P}.readme"
 
 DEPEND=">=dev-perl/DBI-1.14
         >=dev-perl/Data-ShowTable-3.3
+	>=dev-db/mysql-3.23.30
         >=sys-devel/perl-5"
 
 src_compile() {
diff --git a/net-ftp/proftpd/proftpd-1.2.0_rc2-r1.ebuild b/net-ftp/proftpd/proftpd-1.2.0_rc2-r1.ebuild
index b1d5df912b75..84a6eb62dac9 100644
--- a/net-ftp/proftpd/proftpd-1.2.0_rc2-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.2.0_rc2-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/net-ftp/proftpd/proftpd-1.2.0_rc2-r1.ebuild,v 1.4 2000/11/02 08:31:52 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.0_rc2-r1.ebuild,v 1.5 2001/01/27 14:41:33 achim Exp $
 
 P=proftpd-1.2.0rc2
 A="${P}.tar.gz"
@@ -36,6 +36,7 @@ src_install() {
 
      cd ${S}
      into /usr
+     dodir /home/ftp
      dobin contrib/genuser.pl
      dodoc COPYING CREDITS ChangeLog NEWS
      dodoc README*
diff --git a/net-www/cocoon/cocoon-1.8.ebuild b/net-www/cocoon/cocoon-1.8.ebuild
index d1ad4a94edca..8f53061680cb 100644
--- a/net-www/cocoon/cocoon-1.8.ebuild
+++ b/net-www/cocoon/cocoon-1.8.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/net-www/cocoon/cocoon-1.8.ebuild,v 1.2 2001/01/05 07:58:48 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/cocoon/cocoon-1.8.ebuild,v 1.3 2001/01/27 14:41:33 achim Exp $
 
 A=Cocoon-${PV}.tar.gz
 S=${WORKDIR}/${P}
@@ -38,6 +38,7 @@ src_install() {
      doins  lib/$i.jar
   done
   doins build/cocoon.jar
+  dodir /opt/tomcat/webapps/cocoon/repository
   insinto /opt/tomcat/webapps/cocoon/WEB-INF
   cp -a samples ${D}/opt/tomcat/webapps/cocoon
   doins ${FILESDIR}/cocoon.properties
diff --git a/net-www/mozilla/files/digest-mozilla-0.7 b/net-www/mozilla/files/digest-mozilla-0.7
new file mode 100644
index 000000000000..bf9bb2860bc4
--- /dev/null
+++ b/net-www/mozilla/files/digest-mozilla-0.7
@@ -0,0 +1 @@
+MD5 d945e4420ab6f0b7097b040770bd9ee6 mozilla-source-0.7.tar.gz
diff --git a/sys-apps/baselayout/baselayout-1.5-r1.ebuild b/sys-apps/baselayout/baselayout-1.5-r1.ebuild
index 0ba217ce3531..7b0c7673f1ab 100644
--- a/sys-apps/baselayout/baselayout-1.5-r1.ebuild
+++ b/sys-apps/baselayout/baselayout-1.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 Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.5-r1.ebuild,v 1.1 2001/01/22 16:00:40 drobbins Exp $# Copyright 1999-2000 Gentoo Technologies, Inc.
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.5-r1.ebuild,v 1.2 2001/01/27 14:41:33 achim Exp $# Copyright 1999-2000 Gentoo Technologies, Inc.
 
 A=""
 S=${WORKDIR}/${P}
@@ -30,7 +30,7 @@ src_install()
 	do
 		dodir /usr/local/${foo}
 	done
-	doman ${FILESDIR}/MAKEDEV.8
+
 	dodir /usr/lib
 	dodir /usr/sbin
 	dosbin ${FILESDIR}/MAKEDEV ${FILESDIR}/run-crons
@@ -44,7 +44,8 @@ src_install()
 	dosym share/doc /usr/doc
 	dosym share/info /usr/info
 #end FHS 2.1 stuff
-	
+	doman ${FILESDIR}/MAKEDEV.8	
+
 	dodoc ${FILESDIR}/copyright ${FILESDIR}/changelog.Debian
 	dodir /usr/X11R6/lib 
 	dodir /var /var/shm /var/run /var/log/news
diff --git a/sys-apps/bootdisk/files/bootgrub-1.0_rc5.img b/sys-apps/bootdisk/files/bootgrub-1.0_rc4.img
index 59e448047196..59e448047196 100644
--- a/sys-apps/bootdisk/files/bootgrub-1.0_rc5.img
+++ b/sys-apps/bootdisk/files/bootgrub-1.0_rc4.img
diff --git a/sys-apps/net-tools/net-tools-1.57-r1.ebuild b/sys-apps/net-tools/net-tools-1.57-r1.ebuild
index 801ac527b514..be1b5cd33f04 100644
--- a/sys-apps/net-tools/net-tools-1.57-r1.ebuild
+++ b/sys-apps/net-tools/net-tools-1.57-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-apps/net-tools/net-tools-1.57-r1.ebuild,v 1.7 2000/12/24 09:55:16 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.57-r1.ebuild,v 1.8 2001/01/27 14:41:34 achim Exp $
 
 P=net-tools-1.57
 A=${P}.tar.bz2
@@ -29,7 +29,7 @@ src_unpack() {
 src_install() {    
 	try make BASEDIR=${D} install 
 	mv ${D}/bin/* ${D}/sbin   
-	for i in hostname domainname netstat
+	for i in hostname domainname netstat dnsdomainname ypdomainname nisdomainname
 	do
 	  mv ${D}/sbin/${i} ${D}/bin
 	done                       
diff --git a/sys-apps/sh-utils/sh-utils-2.0j-r1.ebuild b/sys-apps/sh-utils/sh-utils-2.0j-r1.ebuild
index 0025f379a875..8d2e638cd04f 100644
--- a/sys-apps/sh-utils/sh-utils-2.0j-r1.ebuild
+++ b/sys-apps/sh-utils/sh-utils-2.0j-r1.ebuild
@@ -2,7 +2,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-apps/sh-utils/sh-utils-2.0j-r1.ebuild,v 1.7 2000/12/01 21:58:45 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sh-utils/sh-utils-2.0j-r1.ebuild,v 1.8 2001/01/27 14:41:34 achim Exp $
 
 P=sh-utils-2.0j
 A=${P}.tar.gz
@@ -32,7 +32,7 @@ src_install() {
 	rm -rf ${D}/usr/lib    
 	dodir /bin
         cd ${D}/usr/bin
-        mv date echo false pwd stty su true uname hostname ${D}/bin                      
+        mv date echo false pwd stty su true uname hostname ${D}/bin
 	dodoc AUTHORS COPYING ChangeLog ChangeLog.0 \
 	      NEWS README THANKS TODO
 }
diff --git a/sys-apps/textutils/textutils-2.0.10.ebuild b/sys-apps/textutils/textutils-2.0.10.ebuild
index 08c79e858442..a0bb7e7a917f 100644
--- a/sys-apps/textutils/textutils-2.0.10.ebuild
+++ b/sys-apps/textutils/textutils-2.0.10.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-apps/textutils/textutils-2.0.10.ebuild,v 1.2 2000/12/13 15:13:59 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/textutils/textutils-2.0.10.ebuild,v 1.3 2001/01/27 14:41:34 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -12,7 +12,7 @@ DEPEND=">=sys-libs/glibc-2.1.3"
 
 src_compile() {                           
 	echo $S $WORKDIR `pwd`
-	try ./configure --prefix=/usr --host=${CHOST} --build=${CHOST} \
+	try ./configure --prefix=/usr --host=${CHOST} \
 	--without-included-regex
 	try make ${MAKEOPTS}
 }
diff --git a/sys-build/gcc/gcc-2.95.2-r4.ebuild b/sys-build/gcc/gcc-2.95.2-r4.ebuild
index d539c25273a0..85446cb5e974 100644
--- a/sys-build/gcc/gcc-2.95.2-r4.ebuild
+++ b/sys-build/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-build/gcc/gcc-2.95.2-r4.ebuild,v 1.2 2001/01/27 08:38:36 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-build/gcc/gcc-2.95.2-r4.ebuild,v 1.3 2001/01/27 14:41:34 achim Exp $
 
 P=gcc-2.95.2
 A="gcc-2.95.2.tar.gz 
@@ -69,10 +69,10 @@ src_install() {
 	try make install prefix=${D}${T} mandir=${D}${T}/man
         cd texinfo
         dobin makeinfo/makeinfo util/texi2dvi util/install-info util/texindex
-        FULLPATH=${D}${T}/lib/gcc-lib/${THOST}/${PV}
+        FULLPATH=${D}${T}/lib/gcc-lib/${CHOST}/${PV}
 	cd ${FULLPATH}
 	dodir /lib
-	dosym	${T}/lib/gcc-lib/${THOST}/${PV}/cpp /lib/cpp
+	dosym	${T}/lib/gcc-lib/${CHOST}/${PV}/cpp /lib/cpp
 	dosym   /usr/bin/gcc /usr/bin/cc
         rm -rf ${D}/usr/info ${D}/usr/man
 }
diff --git a/sys-devel/autoconf/autoconf-2.13-r1.ebuild b/sys-devel/autoconf/autoconf-2.13-r1.ebuild
index 149934e421bf..6ced079a2be9 100644
--- a/sys-devel/autoconf/autoconf-2.13-r1.ebuild
+++ b/sys-devel/autoconf/autoconf-2.13-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/autoconf/autoconf-2.13-r1.ebuild,v 1.5 2000/11/30 23:15:06 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.13-r1.ebuild,v 1.6 2001/01/27 14:41:34 achim Exp $
 
 P=autoconf-2.13      
 A=${P}.tar.gz
@@ -10,7 +10,7 @@ DESCRIPTION="Used to create autoconfiguration files"
 SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/autoconf/${A}
 	 ftp://prep.ai.mit.edu/gnu/autoconf/${A}"
 HOMEPAGE="http://www.gnu.org/software/autoconf/autoconf.html"
-DEPEND=""
+DEPEND=">=sys-devel/perl-5.6"
 RDEPEND=">=sys-apps/bash-2.04
 	 >=sys-devel/perl-5.6"
 
diff --git a/sys-devel/automake/automake-1.4-r1.ebuild b/sys-devel/automake/automake-1.4-r1.ebuild
index 0827c357019b..f9f93a3ae290 100644
--- a/sys-devel/automake/automake-1.4-r1.ebuild
+++ b/sys-devel/automake/automake-1.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/automake/automake-1.4-r1.ebuild,v 1.5 2000/11/30 23:15:06 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.4-r1.ebuild,v 1.6 2001/01/27 14:41:34 achim Exp $
 
 P=automake-1.4      
 A=${P}.tar.gz
@@ -10,7 +10,7 @@ DESCRIPTION="Used to generate Makefile.in from Makefile.am"
 SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/automake/${A}
 	 ftp://prep.ai.mit.edu/gnu/automake/${A}"
 HOMEPAGE="http://www.gnu.org/software/automake/automake.html"
-DEPEND=""
+DEPEND=">=sys-devel/perl-5.6"
 RDEPEND=">=sys-apps/bash-2.04
 	 >=sys-devel/perl-5.6"
 
diff --git a/sys-devel/binutils/binutils-2.10.1.ebuild b/sys-devel/binutils/binutils-2.10.1.ebuild
index 243708938472..f140381b2dfd 100644
--- a/sys-devel/binutils/binutils-2.10.1.ebuild
+++ b/sys-devel/binutils/binutils-2.10.1.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/binutils/binutils-2.10.1.ebuild,v 1.2 2000/11/30 23:15:06 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.10.1.ebuild,v 1.3 2001/01/27 14:41:34 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -11,7 +11,7 @@ DEPEND=">=sys-libs/glibc-2.1.3"
 
 src_compile() {                           
 	try ./configure --prefix=/usr --host=${CHOST}
-	try make ${MAKEOPTS} 
+	try make ${MAKEOPTS}
 }
 
 src_install() {
diff --git a/sys-devel/gcc/gcc-2.95.2-r4.ebuild b/sys-devel/gcc/gcc-2.95.2-r4.ebuild
index f00d295d6091..0945b7083c11 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.3 2000/11/30 23:15:06 achim Exp $
+# $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 $
 
 P=gcc-2.95.2
 A="gcc-2.95.2.tar.gz 
@@ -45,7 +45,7 @@ src_unpack() {
     gzip -dc ${DISTDIR}/libg++-2.8.1.3-20000914.diff.gz | patch -p1
     einfo "Moving trees"
     cd ${S}
-    rm -rf texinfo
+    #rm -rf texinfo
     mv ../libg++-2.8.1.3/* .
     rmdir ../libg++-2.8.1.3
     zcat ${FILESDIR}/${A0} | patch -p0
@@ -64,14 +64,14 @@ src_compile() {
 	fi
 	try ${S}/configure --prefix=${T} --enable-version-specific-runtime-libs \
 		       --host=${CHOST} --enable-threads --enable-shared \
-		        --with-local-prefix=${T}/local --enable-nls 
+		        --with-local-prefix=${T}/local --enable-nls
 	# Parallel build does not work				       
 	try make ${MAKEOPTS} bootstrap-lean
 }
 
 src_install() { 
   
-	try make install prefix=${D}${T} mandir=${D}${T}/man 
+	try make install prefix=${D}${T} mandir=${D}${T}/man
         FULLPATH=${D}${T}/lib/gcc-lib/${CHOST}/${PV}
 	cd ${FULLPATH}
 	dodir /lib
diff --git a/sys-devel/ld.so/ld.so-1.9.11-r1.ebuild b/sys-devel/ld.so/ld.so-1.9.11-r1.ebuild
index 890d11d068ab..839064bcee8a 100644
--- a/sys-devel/ld.so/ld.so-1.9.11-r1.ebuild
+++ b/sys-devel/ld.so/ld.so-1.9.11-r1.ebuild
@@ -1,15 +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/ld.so/ld.so-1.9.11-r1.ebuild,v 1.4 2000/12/15 07:29:29 jerry Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/ld.so/ld.so-1.9.11-r1.ebuild,v 1.5 2001/01/27 14:41:34 achim Exp $
 
 P=ld.so-1.9.11
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Linux dynamic loader & linker"
 SRC_URI="ftp://ftp.ods.com/pub/linux/${A}"
-DEPEND=""
-RDEPEND="=sys-libs/lib-compat"
+RDEPEND="sys-libs/lib-compat"
 
 src_compile() {                           
 	cd ${S}
diff --git a/sys-libs/ncurses/ncurses-5.2-r1.ebuild b/sys-libs/ncurses/ncurses-5.2-r1.ebuild
index 63cf4b780cb7..1d5a7d7d3630 100644
--- a/sys-libs/ncurses/ncurses-5.2-r1.ebuild
+++ b/sys-libs/ncurses/ncurses-5.2-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-libs/ncurses/ncurses-5.2-r1.ebuild,v 1.2 2001/01/22 04:26:51 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.2-r1.ebuild,v 1.3 2001/01/27 14:41:34 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -14,7 +14,7 @@ DEPEND=">=sys-libs/glibc-2.1.3"
 src_compile() {  
 	try ./configure --prefix=/usr --libdir=/lib \
 		--enable-symlinks --disable-termcap \
-		--with-shared --with-libtool \
+		--with-shared \
 		--without-debug --with-rcs-ids \
 		--host=${CHOST}
 	try make ${MAKEOPTS}
diff --git a/sys-libs/readline/readline-4.1-r1.ebuild b/sys-libs/readline/readline-4.1-r1.ebuild
index 515dc0ff0f34..1e0fed166e66 100644
--- a/sys-libs/readline/readline-4.1-r1.ebuild
+++ b/sys-libs/readline/readline-4.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 Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-4.1-r1.ebuild,v 1.8 2000/12/24 09:55:16 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-4.1-r1.ebuild,v 1.9 2001/01/27 14:41:34 achim Exp $
 
 P=readline-4.1
 A=${P}.tar.gz
@@ -10,9 +10,11 @@ DESCRIPTION="Another cute console display library"
 SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/readline/${A}
 	 ftp://ftp.gnu.org/gnu/readline/${A}"
 
-DEPEND=">=sys-libs/glibc-2.1.3"
+DEPEND=">=sys-libs/glibc-2.1.3
+	>=sys-libs/ncurses-5.2"
+
+RDEPEND=">=sys-libs/glibc-2.1.3"
 
-RDEPEND=$DEPEND
 
 src_compile() {                           
     try ./configure --host=${CHOST} --with-curses --prefix=/usr
@@ -22,6 +24,7 @@ src_compile() {
 
 }
 
+
 src_install() {                               
 	cd ${S}
 	try make prefix=${D}/usr install
@@ -44,3 +47,4 @@ src_install() {
 
 
 
+