Dependencie fixes

55 files changed, 215 insertions, 191 deletions

diff --git a/app-admin/jinit/jinit-0.1.9-r1.build b/app-admin/jinit/jinit-0.1.9-r1.ebuild
index 51309ea68d5f..81b0d164e183 100644
--- a/app-admin/jinit/jinit-0.1.9-r1.build
+++ b/app-admin/jinit/jinit-0.1.9-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/app-admin/jinit/jinit-0.1.9-r1.build,v 1.1 2001/04/09 21:04:35 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/jinit/jinit-0.1.9-r1.ebuild,v 1.1 2001/05/28 05:24:13 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -10,6 +10,7 @@ SRC_URI="http://homepage.ntlworld.com/john.fremlin/programs/linux/jinit/download
 HOMEPAGE="http://homepage.ntlworld.com/john.fremlin/programs/linux/jinit/
           http://www.atnf.csiro.au/~rgooch/linux/boot-scripts/"
 
+DEPEND="virtual/glibc"
 
 src_compile() {
 
diff --git a/app-arch/rpm/rpm-3.0.6-r1.ebuild b/app-arch/rpm/rpm-3.0.6-r1.ebuild
index 692c347481ad..34f971455e33 100644
--- a/app-arch/rpm/rpm-3.0.6-r1.ebuild
+++ b/app-arch/rpm/rpm-3.0.6-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/app-arch/rpm/rpm-3.0.6-r1.ebuild,v 1.3 2001/04/30 10:59:02 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-3.0.6-r1.ebuild,v 1.4 2001/05/28 05:24:13 achim Exp $
 
 A="${P}.tar.gz"
 S=${WORKDIR}/${P}
@@ -9,14 +9,11 @@ DESCRIPTION="Red Hat Package Management Utils"
 SRC_URI="ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/${A}"
 HOMEPAGE="http://www.rpm.org/"
 
-DEPEND="nls? ( sys-devel/gettext )
-    sys-libs/db
+RDEPEND="=sys-libs/db-1.85-r1
 	>=sys-libs/zlib-1.1.3
 	>=sys-apps/bzip2-1.0.1"
 
-REPEND=">=sys-libs/zlib-1.1.3
-	sys-libs/db
-    sys-devel/perl"
+DEPEND="$RDEPEND nls? ( sys-devel/gettext )"
 
 src_unpack() {
 
diff --git a/app-crypt/gnupg/gnupg-1.0.5.ebuild b/app-crypt/gnupg/gnupg-1.0.5.ebuild
index 92a9e727e027..1808890b1c12 100644
--- a/app-crypt/gnupg/gnupg-1.0.5.ebuild
+++ b/app-crypt/gnupg/gnupg-1.0.5.ebuild
@@ -11,7 +11,8 @@ DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
 SRC_URI="ftp://ftp.gnupg.org/pub/gcrypt/gnupg/${A}"
 HOMEPAGE="http://www.gnupg.org/"
 
-DEPEND=">=sys-devel/gettext-0.10.35
+DEPEND="virtual/glibc
+        nls? ( >=sys-devel/gettext-0.10.35 )
 	>=sys-libs/zlib-1.1.3"
 
 src_compile() {
@@ -22,7 +23,7 @@ src_compile() {
 	myconf="--disable-nls"
    fi
 
-    try ./configure --prefix=/usr --mandir=/usr/share \
+    try ./configure --prefix=/usr --mandir=/usr/share --infodir=/usr/share/info \
 	--enable-static-rnd=linux --enable-m-guard --host=${CHOST}\
 	${myconf}
     try make
@@ -31,12 +32,18 @@ src_compile() {
 
 src_install () {
 
-    try make DESTDIR=${D} install
+    try make prefix=${D}/usr mandir=${D}/usr/share/man infodir=${D}/usr/share/info install
     dodoc ABOUT-NLS AUTHORS BUGS COPYING ChangeLog INSTALL NEWS PROJECTS
     dodoc README TODO VERSION
     docinto doc
     cd doc
-    dodoc faq.html faq.raw gpg.sgml gpgv.sgml FAQ HACKING DETAILS ChangeLog
+    dodoc  FAQ HACKING DETAILS ChangeLog
+    docint sgml
+    dodoc gpg.sgml gpgv.sgml
+    docinto html
+    dodoc faq.html
+    docinto txt
+    dodoc faq.raw
     chmod +s ${D}/usr/bin/gpg
 }
 
diff --git a/app-doc/gimp-user-manual/gimp-user-manual-2.0.ebuild b/app-doc/gimp-user-manual/gimp-user-manual-2.0.ebuild
index ea2965c77bdb..a0daf09b479d 100644
--- a/app-doc/gimp-user-manual/gimp-user-manual-2.0.ebuild
+++ b/app-doc/gimp-user-manual/gimp-user-manual-2.0.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-doc/gimp-user-manual/gimp-user-manual-2.0.ebuild,v 1.1 2001/02/27 03:06:16 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/gimp-user-manual/gimp-user-manual-2.0.ebuild,v 1.2 2001/05/28 05:24:13 achim Exp $
 
 A="GimpUsersManual_SecondEdition-HTML_Search.tar.gz
    GimpUsersManual_SecondEdition-HTML_Color.tar.gz"
@@ -32,9 +32,9 @@ src_compile() {
 
 src_install () {
 
-   dodir /usr/doc/${P}/html
-   cp -a ${S}/GUM ${D}/usr/doc/${P}/html
-   cp -a ${S}/GUMC ${D}/usr/doc/${P}/html
+   dodir /usr/share/doc/${PF}/html
+   cp -a ${S}/GUM ${D}/usr/share/doc/${PF}/html
+   cp -a ${S}/GUMC ${D}/usr/share/doc/${PF}/html
    dodoc README_NOW
 }
 
diff --git a/app-misc/screen/screen-3.9.8.ebuild b/app-misc/screen/screen-3.9.8.ebuild
index 809589e37a8f..2e49cf4ad3c9 100644
--- a/app-misc/screen/screen-3.9.8.ebuild
+++ b/app-misc/screen/screen-3.9.8.ebuild
@@ -12,16 +12,15 @@ physical terminal between several processes"
 SRC_URI="ftp://ftp.uni-erlangen.de/pub/utilities/screen/${A}"
 HOMEPAGE="http://www.gnu.org/software/screen/"
 
-DEPEND=">=sys-libs/glibc-2.1.3
-        >=sys-libs/gpm-1.19.3
+DEPEND="virtual/glibc
         >=sys-libs/ncurses-5.2"
 
 src_compile() {
 
-    try ./configure --prefix=/usr --host=${CHOST}\
+    try ./configure --prefix=/usr --host=${CHOST} --with-sys-screenrc=/etc/screen/screenrc \
 	--mandir=/usr/share --libexecdir=/usr/lib/misc\
 	--host=${CHOST}
-    try make
+    try make CFLAGS=\"$CFLAGS\"
 
 }
 
@@ -33,14 +32,15 @@ src_install () {
     dodir
     insinto /usr/share/terminfo
     doins terminfo/screencap
-    insinto /etc
+    insinto /etc/screen
     doins etc/screenrc
     dodoc README ChangeLog INSTALL COPYING TODO
     docinto doc
     cd doc
     dodoc FAQ README.DOTSCREEN 
     docinto print
-    cd print
     dodoc fdpat.ps window_to_display.ps
+    doinfo *.info*
+    doman screen.1
 }
 
diff --git a/app-misc/splitvt/splitvt-1.6.5.ebuild b/app-misc/splitvt/splitvt-1.6.5.ebuild
index eafa86a768db..0e4778f2d15d 100644
--- a/app-misc/splitvt/splitvt-1.6.5.ebuild
+++ b/app-misc/splitvt/splitvt-1.6.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Ryan Tolboom <ryan@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-misc/splitvt/splitvt-1.6.5.ebuild,v 1.2 2001/02/11 20:25:53 ryan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/splitvt/splitvt-1.6.5.ebuild,v 1.3 2001/05/28 05:24:13 achim Exp $
 
 S=${WORKDIR}/splitvt-1.6.5
 SRC_URI="http://www.devolution.com/~slouken/projects/splitvt/splitvt-1.6.5.tar.gz"
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.devolution.com/~slouken/projects/splitvt"
 
 DESCRIPTION="A program for splitting terminals into two shells"
 
-DEPEND=">=sys-libs/ncurses-5.1"
+DEPEND="virtual/glibc >=sys-libs/ncurses-5.2"
 
 src_unpack() {
     
@@ -19,11 +19,14 @@ src_unpack() {
     cp config.c config.orig
     cat config.orig | sed "s:/usr/local/bin:${D}/usr/bin:g" > config.c
 
+
 }
-	 
+
 src_compile() {
 
     try ./configure
+    cp Makefile Makefile.orig
+    sed -e "s:-O2:${CFLAGS}:" Makefile.orig > Makefile
     try make
 
 }
diff --git a/app-text/dictd/dictd-1.5.5.ebuild b/app-text/dictd/dictd-1.5.5.ebuild
index a59208c17410..c5fd1606df7a 100644
--- a/app-text/dictd/dictd-1.5.5.ebuild
+++ b/app-text/dictd/dictd-1.5.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Michael Conrad Tilstra <michael@gentoo.org> <tadpol@tadpol.org>
-# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/dictd-1.5.5.ebuild,v 1.2 2001/04/24 22:58:35 michael Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/dictd-1.5.5.ebuild,v 1.3 2001/05/28 05:24:13 achim Exp $
 
 #P=
 A=${P}.tar.gz
@@ -10,11 +10,11 @@ DESCRIPTION="Dictionary Client/Server for the DICT protocol"
 SRC_URI="ftp://ftp.dict.org/pub/dict/${A}"
 HOMEPAGE="http://www.dict.org"
 
-DEPEND="virtual/glibc
-        >=sys-devel/gettext-0.10.35"
+DEPEND="virtual/glibc"
 
 
 src_compile() {
+    
     try ./configure --prefix=/usr --mandir=/usr/share \
         --with-etcdir=/etc/dict --host=${CHOST}
     try make
diff --git a/app-text/ispell/ispell-3.1.20-r1.ebuild b/app-text/ispell/ispell-3.1.20-r1.ebuild
index bdaa08a044d2..0c69e952914f 100644
--- a/app-text/ispell/ispell-3.1.20-r1.ebuild
+++ b/app-text/ispell/ispell-3.1.20-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/app-text/ispell/ispell-3.1.20-r1.ebuild,v 1.2 2001/03/20 05:47:31 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ispell/ispell-3.1.20-r1.ebuild,v 1.3 2001/05/28 05:24:13 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${PN}-3.1
@@ -9,6 +9,7 @@ DESCRIPTION="Ispell is a fast screen-oriented spelling checker"
 SRC_URI="ftp://ftp.cs.ucla.edu/pub/ispell-3.1/${A}"
 HOMEPAGE="http://fmg-www.cs.ucla.edu/geoff/ispell.html"
 
+DEPEND="virtual/glibc >=sys-libs/ncurses-5.2"
 src_unpack() {
 
   unpack ${A}
diff --git a/app-text/pspell/pspell-0.11.2.ebuild b/app-text/pspell/pspell-0.11.2.ebuild
index 6c8f2973ae39..4bf9640daf41 100644
--- a/app-text/pspell/pspell-0.11.2.ebuild
+++ b/app-text/pspell/pspell-0.11.2.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-text/pspell/pspell-0.11.2.ebuild,v 1.2 2000/11/25 13:13:30 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pspell/pspell-0.11.2.ebuild,v 1.3 2001/05/28 05:24:13 achim Exp $
 
 A=${PN}-.11.2.tar.gz
 S=${WORKDIR}/${PN}-.11.2
@@ -9,6 +9,7 @@ DESCRIPTION="A spell checker replacement for ispell"
 SRC_URI="http://download.sourceforge.net/pspell/${A}"
 HOMEPAGE="http://pspell.sourceforge.net"
 
+DEPEND="virtual/glibc"
 
 src_compile() {
 
diff --git a/app-text/psutils/psutils-1.17.ebuild b/app-text/psutils/psutils-1.17.ebuild
index 1c0c5431e693..5217ac271450 100644
--- a/app-text/psutils/psutils-1.17.ebuild
+++ b/app-text/psutils/psutils-1.17.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 Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/app-text/psutils/psutils-1.17.ebuild,v 1.1 2001/03/19 22:45:05 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/psutils/psutils-1.17.ebuild,v 1.2 2001/05/28 05:24:13 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${PN}
@@ -9,7 +9,8 @@ DESCRIPTION="Post Script Utilities"
 SRC_URI="ftp://ftp.enst.fr/pub/unix/a2ps/${A}"
 HOMEPAGE="http://"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/glibc sys-devel/perl"
+RDEPEND="virtual/glibc"
 
 src_unpack() {
     unpack ${A}
diff --git a/app-text/rcs/rcs-5.7-r1.ebuild b/app-text/rcs/rcs-5.7-r1.ebuild
index f91620abab39..8e1e4df6fdc8 100644
--- a/app-text/rcs/rcs-5.7-r1.ebuild
+++ b/app-text/rcs/rcs-5.7-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/app-text/rcs/rcs-5.7-r1.ebuild,v 1.1 2001/03/20 06:21:37 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/rcs/rcs-5.7-r1.ebuild,v 1.2 2001/05/28 05:24:13 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -10,7 +10,9 @@ SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/rcs/${A}
 	 ftp://ftp.gnu.org/gnu/rcs/${A}"
 HOMEPAGE="http://www.gnu.org/software/rcs/"
 
-DEPEND="virtual/glibc
+EPEND="virtual/glibc"
+
+REPEND="virtual/glibc
 	sys-apps/diffutils"
 
 src_compile() {
diff --git a/app-text/ttf2pt1/ttf2pt1-3.3.3.ebuild b/app-text/ttf2pt1/ttf2pt1-3.3.3.ebuild
index 06c4226631b9..8ebe7c4a73e4 100644
--- a/app-text/ttf2pt1/ttf2pt1-3.3.3.ebuild
+++ b/app-text/ttf2pt1/ttf2pt1-3.3.3.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-text/ttf2pt1/ttf2pt1-3.3.3.ebuild,v 1.1 2001/03/20 06:43:35 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ttf2pt1/ttf2pt1-3.3.3.ebuild,v 1.2 2001/05/28 05:24:13 achim Exp $
 
 A=${P}.tgz
 S=${WORKDIR}/${P}
@@ -9,7 +9,8 @@ DESCRIPTION="Converts True Type to Type 1 fonts"
 SRC_URI="http://download.sourceforge.net/ttf2pt1/${A}"
 HOMEPAGE="http://ttf2pt1.sourceforge.net"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/glibc
+        =media-libs/freetype-1.3.1-r2"
 
 src_unpack() {
     unpack ${A}
diff --git a/berlin-base/omniORB/omniORB-303.ebuild b/berlin-base/omniORB/omniORB-303.ebuild
index 2dcf489fe49c..e28d2e5b4671 100644
--- a/berlin-base/omniORB/omniORB-303.ebuild
+++ b/berlin-base/omniORB/omniORB-303.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 Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/berlin-base/omniORB/omniORB-303.ebuild,v 1.6 2001/05/03 19:33:52 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/berlin-base/omniORB/omniORB-303.ebuild,v 1.7 2001/05/28 05:24:13 achim Exp $
 
 A="${PN}_${PV}.tar.gz omniORBpy_1_3.tar.gz"
 S=${WORKDIR}/omni
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.uk.research.att.com/pub/omniORB/omniORB3/${PN}_${PV}.tar.gz
 	 ftp://ftp.uk.research.att.com/pub/omniORB/omniORBpy/${PN}py_1_3.tar.gz"
 HOMEPAGE="http://www.uk.research.att.com/omniORB/"
 
-DEPEND=""
+DEPEND="virtual/glibc dev-lang/python"
 
 PLT="i586_linux_2.0_glibc2.1"
 
diff --git a/dev-lang/jdk/jdk-1.3.0.ebuild b/dev-lang/jdk/jdk-1.3.0.ebuild
index e154a99c9218..f84feaf2180f 100644
--- a/dev-lang/jdk/jdk-1.3.0.ebuild
+++ b/dev-lang/jdk/jdk-1.3.0.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-lang/jdk/jdk-1.3.0.ebuild,v 1.4 2001/05/01 18:29:05 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/jdk/jdk-1.3.0.ebuild,v 1.5 2001/05/28 05:24:13 achim Exp $
 
 P=jdk-1.3.0
 A=j2sdk-1.3.0-FCS-linux-i386.tar.bz2
@@ -10,23 +10,19 @@ DESCRIPTION="Blackdown JDK 1.3.0"
 SRC_URI="http://www.ibiblio.org/pub/linux/devel/lang/java/blackdown.org/JDK-1.3.0/i386/FCS/${A}"
 HOMEPAGE="http://www.blackdown.org/java-linux.html"
 
-DEPEND=">=sys-apps/bash-2.04 
-	>=sys-libs/glibc-2.1.3
+DEPEND="virtual/glibc"
+RDEPEND="virtual/glibc
 	virtual/x11"
 
-src_compile() {                           
-  cd ${S}
-}
-
-src_install() {                               
+src_install() {
   dodir /opt/jdk-${PV}
-  dodir /usr
+  dodir /usr/share
   cp -a ${S}/bin ${D}/opt/jdk-${PV}
   cp -a ${S}/demo ${D}/opt/jdk-${PV}
   cp -a ${S}/include ${D}/opt/jdk-${PV}
   cp -a ${S}/lib ${D}/opt/jdk-${PV}
   cp -a ${S}/jre ${D}/opt/jdk-${PV}
-  cp -a ${S}/man ${D}/usr
+  cp -a ${S}/man ${D}/usr/share
   cp    ${S}/src.jar ${D}/opt/jdk-${PV}
   into /usr
   dodoc COPYRIGHT LICENSE README
diff --git a/dev-util/cscope/cscope-15.1.ebuild b/dev-util/cscope/cscope-15.1.ebuild
index 499374b7fe8e..760f1da52826 100644
--- a/dev-util/cscope/cscope-15.1.ebuild
+++ b/dev-util/cscope/cscope-15.1.ebuild
@@ -8,9 +8,9 @@ DESCRIPTION="CScope - interactively examine a C program"
 SRC_URI="http://download.sourceforge.net/cscope/${A}"
 HOMEPAGE="http://cscope.sourceforge.net"
 
-DEPEND="virtual/glibc
+RDEPEND="virtual/glibc
 	>=sys-libs/ncurses-5.2"
-
+DEPEND="$RDEPEND sys-devel/flex"
 src_compile() {                           
    try ./configure --prefix=/usr/ --mandir=/usr/share/man --infodir=/usr/share/info
    try make clean
diff --git a/dev-util/fbset/fbset-2.1.ebuild b/dev-util/fbset/fbset-2.1.ebuild
index 1915fd09cb39..9d40091a7482 100644
--- a/dev-util/fbset/fbset-2.1.ebuild
+++ b/dev-util/fbset/fbset-2.1.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/dev-util/fbset/fbset-2.1.ebuild,v 1.1 2001/02/09 07:38:39 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/fbset/fbset-2.1.ebuild,v 1.2 2001/05/28 05:24:13 achim Exp $
 
-#P=
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="A utility to set the framebuffer videomode"
 SRC_URI="http://home.tvd.be/cr26864/Linux/fbdev/${A}"
 HOMEPAGE="http://linux-fbdev.org"
 
+DEPEND="virtual/glibc"
 
 src_compile() {
 
diff --git a/dev-util/sel/sel-0.08.2.ebuild b/dev-util/sel/sel-0.08.2.ebuild
index 7fac358ee1f2..5d7c20b3b772 100644
--- a/dev-util/sel/sel-0.08.2.ebuild
+++ b/dev-util/sel/sel-0.08.2.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 Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-util/sel/sel-0.08.2.ebuild,v 1.2 2000/11/01 04:44:16 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/sel/sel-0.08.2.ebuild,v 1.3 2001/05/28 05:24:13 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="A filemanager for shell scripts"
 SRC_URI="http://www.rhein-neckar.de/~darkstar/files/${A}"
 HOMEPAGE="http://www.rhein-neckar.de/~darkstar/sel.html"
-DEPEND=">=sys-libs/glibc-2.1.3
-	>=sys-libs/gpm-1.19.3
+DEPEND="virtual/glibc
 	>=sys-libs/ncurses-5.1"
 
 src_unpack () {
diff --git a/dev-util/strace/strace-4.3.ebuild b/dev-util/strace/strace-4.3.ebuild
index 2eff9a4a7aa9..274b5a2a22ca 100644
--- a/dev-util/strace/strace-4.3.ebuild
+++ b/dev-util/strace/strace-4.3.ebuild
@@ -1,13 +1,13 @@
 # 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-util/strace/strace-4.3.ebuild,v 1.1 2001/04/27 22:49:46 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.3.ebuild,v 1.2 2001/05/28 05:24:13 achim Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A usefull diagnostic, instructional, adn debugging tool"
 SRC_URI="http://prdownloads.sourceforge.net/strace/${P}.tar.bz2"
 HOMEPAGE="http://www.wi.leidenuniv.nl/~wichert/strace/"
-DEPEND=">=sys-libs/glibc-2.1.3"
+DEPEND="virtual/glibc"
 
 src_compile() {
     cd ${S}
diff --git a/media-libs/compface/compface-1.4.ebuild b/media-libs/compface/compface-1.4.ebuild
index bf356ab9165e..f22782baccb3 100644
--- a/media-libs/compface/compface-1.4.ebuild
+++ b/media-libs/compface/compface-1.4.ebuild
@@ -3,14 +3,13 @@
 # Michael C Tisltra <tadpol@tadpol.org>
 # $header
 
-#P=
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Utilities and library to convert to/from X-Face format"
 SRC_URI="http://www.ibiblio.org/pub/Linux/apps/graphics/convert/${A}"
 HOMEPAGE=""
 
-DEPEND=">=sys-libs/glibc-2.2.1"
+DEPEND="virtual/glibc"
 
 src_compile() {
     try ./configure --prefix=/usr --mandir=/usr/share/man --host=${CHOST}
@@ -19,8 +18,8 @@ src_compile() {
 }
 
 src_install () {
-    dodir /usr/share/man/man3
-    try make DESTDIR=${D} install
+    dodir /usr/share/man/man{1,3} /usr/{bin,include,lib}
+    try make prefix=${D}/usr MANDIR=${D}/usr/share/man install
     dodoc README ChangeLog
 }
 
diff --git a/media-libs/mpeg-lib/mpeg-lib-1.3.1-r1.ebuild b/media-libs/mpeg-lib/mpeg-lib-1.3.1-r1.ebuild
index 7e3503ce4991..3e8a5e7d52fb 100644
--- a/media-libs/mpeg-lib/mpeg-lib-1.3.1-r1.ebuild
+++ b/media-libs/mpeg-lib/mpeg-lib-1.3.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/media-libs/mpeg-lib/mpeg-lib-1.3.1-r1.ebuild,v 1.1 2001/02/22 16:44:19 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mpeg-lib/mpeg-lib-1.3.1-r1.ebuild,v 1.2 2001/05/28 05:24:13 achim Exp $
 
 P=mpeg_lib-${PV}
 A=${P}.tar.gz
@@ -15,7 +15,7 @@ DEPEND="virtual/glibc"
 src_compile() {
 
     try ./configure --prefix=/usr --host=${CHOST} --disable-dither
-    try make
+    try make OPTIMIZE=\"$CFLAGS\"
 
 }
 
diff --git a/media-sound/abcde/abcde-1.9.9.ebuild b/media-sound/abcde/abcde-1.9.9.ebuild
index 567e8e1529b6..1e191d98a5b7 100644
--- a/media-sound/abcde/abcde-1.9.9.ebuild
+++ b/media-sound/abcde/abcde-1.9.9.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 Peter Gavin <pbg1854@garnet.acns.fsu.edu>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/abcde-1.9.9.ebuild,v 1.1 2001/04/23 01:00:39 pete Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/abcde-1.9.9.ebuild,v 1.2 2001/05/28 05:24:13 achim Exp $
 
 A=${PN}_${PV}.orig.tar.gz
 
@@ -17,6 +17,7 @@ src_unpack() {
 
     unpack ${A}
     cd ${S}
+    cp Makefile Makefile.orig
     patch -p1 < ${FILESDIR}/${PF}-gentoo.diff
 }
 
diff --git a/media-sound/abcde/files/abcde-1.9.9-gentoo.diff b/media-sound/abcde/files/abcde-1.9.9-gentoo.diff
index 2f9bde642d79..09eaf3bc0797 100644
--- a/media-sound/abcde/files/abcde-1.9.9-gentoo.diff
+++ b/media-sound/abcde/files/abcde-1.9.9-gentoo.diff
@@ -1,15 +1,3 @@
-diff -ur abcde-1.9.9.orig/Makefile abcde-1.9.9/Makefile
---- abcde-1.9.9.orig/Makefile	Tue Mar 13 10:49:02 2001
-+++ abcde-1.9.9/Makefile	Mon Apr 16 20:05:43 2001
-@@ -6,7 +6,7 @@
- exec_prefix = ${prefix}
- mandir = ${prefix}/share/man/man1
- bindir = ${exec_prefix}/bin
--etcdir = ${DESTDIR}/etc
-+etcdir = ${DESTDIR}/etc/abcde
- 
- all:
- 
 diff -ur abcde-1.9.9.orig/abcde abcde-1.9.9/abcde
 --- abcde-1.9.9.orig/abcde	Tue Mar 13 10:49:24 2001
 +++ abcde-1.9.9/abcde	Mon Apr 16 21:14:26 2001
@@ -46,3 +34,20 @@ diff -ur abcde-1.9.9.orig/abcde abcde-1.9.9/abcde
  # Load user preference defaults
  if [ -r $HOME/.abcde.conf ]; then
 Only in abcde-1.9.9: abcde~
+--- abcde-1.9.9/Makefile.orig	Sun May 27 14:36:26 2001
++++ abcde-1.9.9/Makefile	Sun May 27 14:36:38 2001
+@@ -1,12 +1,12 @@
+ VERSION = 1.9.9
+-INSTALL = /usr/bin/install -c
++INSTALL = /bin/install -c
+ 
+ # Installation directories
+ prefix = ${DESTDIR}/usr
+ exec_prefix = ${prefix}
+ mandir = ${prefix}/share/man/man1
+ bindir = ${exec_prefix}/bin
+-etcdir = ${DESTDIR}/etc
++etcdir = ${DESTDIR}/etc/abcde
+ 
+ all:
+ 
diff --git a/media-sound/cd-discid/cd-discid-0.6.ebuild b/media-sound/cd-discid/cd-discid-0.6.ebuild
index 03e7780f7efa..e6cc375eaf84 100644
--- a/media-sound/cd-discid/cd-discid-0.6.ebuild
+++ b/media-sound/cd-discid/cd-discid-0.6.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 Peter Gavin <pbg1854@garnet.acns.fsu.edu>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cd-discid/cd-discid-0.6.ebuild,v 1.1 2001/04/23 01:00:39 pete Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cd-discid/cd-discid-0.6.ebuild,v 1.2 2001/05/28 05:24:13 achim Exp $
 
 A=${PN}_${PV}.orig.tar.gz
 S=${WORKDIR}/${P}
@@ -9,6 +9,7 @@ DESCRIPTION="returns the disc id for the cd in the cd-rom drive"
 SRC_URI="http://lly.org/~rcw/cd-discid/${A}"
 HOMEPAGE="http://lly.org/~rcw/abcde/page/"
 
+DEPEND="virtual/glibc"
 
 src_compile() {
 
diff --git a/media-sound/cdparanoia/cdparanoia-3.9.8.ebuild b/media-sound/cdparanoia/cdparanoia-3.9.8.ebuild
index 70532dc3d93e..fa0700f73cc6 100644
--- a/media-sound/cdparanoia/cdparanoia-3.9.8.ebuild
+++ b/media-sound/cdparanoia/cdparanoia-3.9.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 Peter Gavin <pbg1854@garnet.acns.fsu.edu>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/cdparanoia-3.9.8.ebuild,v 1.1 2001/04/23 01:00:39 pete Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/cdparanoia-3.9.8.ebuild,v 1.2 2001/05/28 05:24:13 achim Exp $
 
 A=${PN}-III-alpha9.8.src.tgz
 S=${WORKDIR}/${PN}-III-alpha9.8
@@ -9,11 +9,12 @@ DESCRIPTION="an advanced CDDA reader with error correction"
 SRC_URI="http://www.xiph.org/paranoia/download/${A}"
 HOMEPAGE="http://www.xiph.org/paranoia/index.html"
 
+DEPEND="virtual/glibc"
 
 src_compile() {
-    cd ${S}
+
     try ./configure --prefix=/usr --host=${CHOST}
-    try make
+    try make OPT=\"$CFLAGS\"
 }
 
 src_install () {
diff --git a/media-sound/dcd/dcd-0.90.ebuild b/media-sound/dcd/dcd-0.90.ebuild
index 5dade004746d..d5b2ed2eaa47 100644
--- a/media-sound/dcd/dcd-0.90.ebuild
+++ b/media-sound/dcd/dcd-0.90.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.technopagan.org/dcd"
 
 DESCRIPTION="A simple command-line based CD Player"
 
-DEPEND=">=sys-libs/glibc-2.1.3"
+DEPEND="virtual/glibc"
 
 src_unpack() {
 
@@ -25,7 +25,7 @@ src_unpack() {
  
 src_compile() {
 
-    try make
+    try make EXTRA_CFLAGS=\"$CFLAGS\"
 
 }
 
diff --git a/media-sound/id3/id3-0.12-r1.ebuild b/media-sound/id3/id3-0.12-r1.ebuild
index 32b738a75b38..e3dbc7acec90 100644
--- a/media-sound/id3/id3-0.12-r1.ebuild
+++ b/media-sound/id3/id3-0.12-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 Peter Gavin <pbg1854@garnet.acns.fsu.edu>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/id3/id3-0.12-r1.ebuild,v 1.1 2001/04/23 01:00:39 pete Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/id3/id3-0.12-r1.ebuild,v 1.2 2001/05/28 05:24:13 achim Exp $
 
 A=${PN}_${PV}.orig.tar.gz
 S=${WORKDIR}/${P}
@@ -17,7 +17,7 @@ src_compile() {
 
 src_install () {
 
-    try make DESTDIR=${D} install
+    try make DESTDIR=${D} INSTALL=\"/bin/install -c\" install
     dodoc COPYING README
 
 }
diff --git a/media-sound/mpg123/mpg123-0.59r.ebuild b/media-sound/mpg123/mpg123-0.59r.ebuild
index 583aaf84b0ba..35cbe6ff7b15 100644
--- a/media-sound/mpg123/mpg123-0.59r.ebuild
+++ b/media-sound/mpg123/mpg123-0.59r.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/media-sound/mpg123/mpg123-0.59r.ebuild,v 1.4 2000/11/02 02:17:13 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-0.59r.ebuild,v 1.5 2001/05/28 05:24:13 achim Exp $
 
 P=mpg123-0.59r
 A=${P}.tar.gz
@@ -10,7 +10,7 @@ DESCRIPTION="Real Time mp3 player"
 SRC_URI="http://www.mpg123.de/mpg123/${A}"
 HOMEPAGE="http://www.mpg123.de/"
 
-DEPEND=">=sys-libs/glibc-2.1.3"
+DEPEND="virtual/glibc"
 
 src_unpack () {
     unpack ${A}
@@ -21,14 +21,12 @@ src_unpack () {
 
 src_compile() {
 
-    cd ${S}
     try make linux-i486
 
 }
 
 src_install () {
 
-    cd ${S}
     into /usr
     dobin mpg123
     doman mpg123.1
diff --git a/media-sound/shorten/shorten-3.2.ebuild b/media-sound/shorten/shorten-3.2.ebuild
index 7e2073a0602a..c30905b5ba49 100644
--- a/media-sound/shorten/shorten-3.2.ebuild
+++ b/media-sound/shorten/shorten-3.2.ebuild
@@ -1,12 +1,12 @@
 # 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/media-sound/shorten/shorten-3.2.ebuild,v 1.1 2001/01/16 05:22:17 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/shorten/shorten-3.2.ebuild,v 1.2 2001/05/28 05:24:13 achim Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Open source, popular and fast lossless audio compressor"
 SRC_URI="http://shnutils.freeshell.org/misc/shorten-3.2.tar.gz"
-DEPEND=">=sys-libs/glibc-2.1.3"
+DEPEND="virtual/glibc"
 
 src_unpack() {
 	unpack ${A}
diff --git a/net-dialup/pppoed/pppoed-0.48_beta1-r1.ebuild b/net-dialup/pppoed/pppoed-0.48_beta1-r1.ebuild
index 9af4a9f32c44..3a0954e5c6b6 100644
--- a/net-dialup/pppoed/pppoed-0.48_beta1-r1.ebuild
+++ b/net-dialup/pppoed/pppoed-0.48_beta1-r1.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 Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/pppoed/pppoed-0.48_beta1-r1.ebuild,v 1.1 2001/04/24 16:00:48 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/pppoed/pppoed-0.48_beta1-r1.ebuild,v 1.2 2001/05/28 05:24:13 achim Exp $
 
 S=${WORKDIR}/pppoed-0.48b1/pppoed
 DESCRIPTION="PPP over Ethernet"
 SRC_URI="http://www.davin.ottawa.on.ca/pppoe/pppoed-0.48b1.tgz"
 HOMEPAGE="http://www.davin.ottawa.on.ca/pppoe/"
 
-DEPEND=">=sys-libs/glibc-2.1.3"
+DEPEND="virtual/glibc"
 
 src_compile() {                           
   cd ${S}
diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.0.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.0.ebuild
index d851e750e137..2b18e2ed0b0c 100644
--- a/net-dialup/rp-pppoe/rp-pppoe-3.0.ebuild
+++ b/net-dialup/rp-pppoe/rp-pppoe-3.0.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>, David Bresson <david.bresson@yale.edu>
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/rp-pppoe-3.0.ebuild,v 1.1 2001/04/24 16:07:19 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/rp-pppoe-3.0.ebuild,v 1.2 2001/05/28 05:24:13 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}/src
@@ -9,9 +9,8 @@ DESCRIPTION="A user-mode PPPoE client and server suite for Linux"
 SRC_URI="http://www.roaringpenguin.com/pppoe/${A}"
 HOMEPAGE="http://www.roaringpeguin.com/"
 
-DEPEND=">=sys-libs/glibc-2.1.3
-	>=sys-apps/bash-2.04
-	>=net-dialup/ppp-2.4.0"
+DEPEND="virtual/glibc"
+RDEPEND="virtual/glibc >=net-dialup/ppp-2.4.0"
 
 src_compile() {
 
diff --git a/net-dialup/wvdial/wvdial-1.41-r3.ebuild b/net-dialup/wvdial/wvdial-1.41-r3.ebuild
index 47c150b00234..830e7cf4489c 100644
--- a/net-dialup/wvdial/wvdial-1.41-r3.ebuild
+++ b/net-dialup/wvdial/wvdial-1.41-r3.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/net-dialup/wvdial/wvdial-1.41-r3.ebuild,v 1.3 2001/04/28 20:02:57 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/wvdial/wvdial-1.41-r3.ebuild,v 1.4 2001/05/28 05:24:13 achim Exp $
 
 P=wvdial-1.41
 A=${P}.tar.gz
@@ -11,7 +11,8 @@ SRC_URI="http://www.worldvisions.ca/wvdial/wvdial-1.41.tar.gz"
 HOMEPAGE="http://www.worldvisions.ca/wvdial/"
 
 DEPEND=">=sys-devel/gcc-2.95.2
-	>=sys-libs/glibc-2.1.3"
+	virtual/glibc"
+RDEPEND="$DEPEND net-dialup/pppd"
 
 src_compile() {                           
     try make
diff --git a/net-fs/autofs/autofs-3.1.7-r1.ebuild b/net-fs/autofs/autofs-3.1.7-r1.ebuild
index bbff7f9741e4..ca190e188a96 100644
--- a/net-fs/autofs/autofs-3.1.7-r1.ebuild
+++ b/net-fs/autofs/autofs-3.1.7-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-fs/autofs/autofs-3.1.7-r1.ebuild,v 1.1 2001/01/18 18:22:11 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-3.1.7-r1.ebuild,v 1.2 2001/05/28 05:24:13 achim Exp $
 
 A=${P}.tar.bz2
 S=${WORKDIR}/${P}
@@ -10,8 +10,8 @@ SRC_URI="ftp://ftp.kernel.org/pub/linux/daemons/autofs/${A}
 	 ftp://ftp.de.kernel.org/pub/linux/daemons/autofs/${A}
 	 ftp://ftp.uk.kernel.org/pub/linux/daemons/autofs/${A}"
 
-DEPEND=">=sys-libs/glibc-2.1.3
-	>=net-nds/openldap-1.2"
+DEPEND="virtual/glibc
+        ldap? ( =net-nds/openlpad-1.2.11-r2 )"
 
 src_unpack() {
   unpack ${A}
@@ -19,14 +19,17 @@ src_unpack() {
   patch -p0 < ${FILESDIR}/automount.diff
 }
 
-src_compile() {                           
-  cd ${S}
-  try ./configure --host=${HOST} --prefix=/usr
+src_compile() {
+  local myconf
+  if [ -z "`use ldap`" ] ; then
+    myconf="--without-openldap"
+  fi
+  try ./configure --host=${HOST} --prefix=/usr $myconf
   try make
 }
 
-src_install() {                               
-  cd ${S}
+src_install() {
+
   into /usr
   dosbin daemon/automount
   insinto /usr/lib/autofs
diff --git a/net-fs/netatalk/netatalk-1.4.99.0.20001108.ebuild b/net-fs/netatalk/netatalk-1.4.99.0.20001108.ebuild
index b924858c838d..e4b9d1210af7 100644
--- a/net-fs/netatalk/netatalk-1.4.99.0.20001108.ebuild
+++ b/net-fs/netatalk/netatalk-1.4.99.0.20001108.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-fs/netatalk/netatalk-1.4.99.0.20001108.ebuild,v 1.1 2000/11/26 20:54:18 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-1.4.99.0.20001108.ebuild,v 1.2 2001/05/28 05:24:13 achim Exp $
 
 P=netatalk-1.4.99-0.20001108
 A=${P}.tar.gz
@@ -10,11 +10,14 @@ DESCRIPTION="Apple-Talk"
 SRC_URI="http://download.sourceforge.net/netatalk/${A}"
 HOMEPAGE="http://netatakl.sourceforge.net"
 
-DEPEND=">=sys-apps/bash-2.04
-	>=sys-libs/glibc-2.1.3"
+DEPEND="virtual/glibc
+        pam? ( sys-libs/pam-0.7 )
+        tcpd? ( sys-apps/tcp-wrappers )
+        sys-apps/shadow"
+
+src_compile() {
+
 
-src_compile() {                           
-  cd ${S}
   try ./configure --prefix=/usr --host=${CHOST} \
   		--with-pam --with-shadow --with-tcp-wrappers
 	
diff --git a/net-fs/nfs-utils/nfs-utils-0.2.1-r3.ebuild b/net-fs/nfs-utils/nfs-utils-0.2.1-r3.ebuild
index 68f90c5847a8..1b080e08b8c9 100644
--- a/net-fs/nfs-utils/nfs-utils-0.2.1-r3.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-0.2.1-r3.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-fs/nfs-utils/nfs-utils-0.2.1-r3.ebuild,v 1.2 2001/04/23 17:29:38 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-0.2.1-r3.ebuild,v 1.3 2001/05/28 05:24:13 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -9,8 +9,8 @@ DESCRIPTION="Kernel NFS-Server"
 SRC_URI="ftp://ftp.linuxnfs.sourceforge.org/pub/nfs/"${A}
 HOMEPAGE="http://nfs.sourceforge.net"
 
-DEPEND=">=sys-apps/bash-2.04
-	>=sys-libs/glibc-2.1.3"
+DEPEND="virtual/glibc
+        tcpd? ( sys-apps/tcp-wrappers )"
 
 src_unpack() {
     unpack ${A}
@@ -20,15 +20,20 @@ src_unpack() {
 src_compile() {
     try ./configure --mandir=${D}/usr/share/man --with-statedir=/var/lib/nfs \
 	--prefix=${D} --exec-prefix=${D}
+    if [ -z "`use tcpd`" ] ; then
+      cp config.mk config.mk.orig
+      sed -e "s:-lwrap::" -e "s:-DHAVE_TCP_WRAPPER::" \
+        config.mk.orig > config.mk
+    fi
     try make
 }
 
-src_install() {                 
-	cd ${S}
+src_install() {
+
 	try make install STATEDIR=${D}/var/lib/nfs
 	dodir /etc/rc.d/init.d
-	cp ${O}/files/nfs       ${D}/etc/rc.d/init.d
-	cp ${O}/files/exports	${D}/etc
+	cp ${FILESDIR}/nfs       ${D}/etc/rc.d/init.d
+	cp ${FILESDIR}/exports	${D}/etc
 	dodoc ChangeLog COPYING README
 	docinto linux-nfs
 	dodoc linux-nfs/*
diff --git a/net-ftp/ftp/ftp-0.17-r1.ebuild b/net-ftp/ftp/ftp-0.17-r1.ebuild
index 2b0d84778664..0038040a0220 100644
--- a/net-ftp/ftp/ftp-0.17-r1.ebuild
+++ b/net-ftp/ftp/ftp-0.17-r1.ebuild
@@ -1,20 +1,18 @@
 # 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/ftp/ftp-0.17-r1.ebuild,v 1.3 2000/11/01 04:44:19 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftp/ftp-0.17-r1.ebuild,v 1.4 2001/05/28 05:24:13 achim Exp $
 
-P=ftp-0.17    
 A=netkit-${P}.tar.gz
 S=${WORKDIR}/netkit-${P}
 DESCRIPTION="Standard Linux FTP client"
 SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${A}"
 
-DEPEND=">=sys-libs/glibc-2.1.3
-	>=sys-libs/gpm-1.19.3
-	>=sys-libs/ncurses-5.1"
+DEPEND="virtual/glibc
+	>=sys-libs/ncurses-5.2"
 
 src_compile() {              
-    cd ${S}             
+    
     try ./configure --prefix=/usr
     cp MCONFIG MCONFIG.orig
     sed -e "s/-pipe -O2/${CFLAGS}/" MCONFIG.orig > MCONFIG
diff --git a/net-ftp/ncftp/ncftp-3.0.2.ebuild b/net-ftp/ncftp/ncftp-3.0.2.ebuild
index 9d1126fbf14c..bfd63fda28b0 100644
--- a/net-ftp/ncftp/ncftp-3.0.2.ebuild
+++ b/net-ftp/ncftp/ncftp-3.0.2.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 Jerry Alexandratos <jerry@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ncftp/ncftp-3.0.2.ebuild,v 1.2 2000/12/22 17:51:19 jerry Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ncftp/ncftp-3.0.2.ebuild,v 1.3 2001/05/28 05:24:13 achim Exp $
 
 A=${P}-src.tar.gz
 S=${WORKDIR}/${P}
@@ -9,16 +9,16 @@ DESCRIPTION="An extremely configurable ftp client"
 SRC_URI="ftp://ftp.ncftp.com/ncftp/${A}"
 HOMEPAGE="http://www.ncftp.com/"
 
-DEPEND=">=sys-libs/glibc-2.1.3"
+DEPEND="virtual/glibc >=sys-libs/ncurses-5.2"
 
 src_compile() {
-    cd ${S}
+
     try ./configure --prefix=/usr --host=${CHOST}
     try make
 }
 
 src_install () {
-    cd ${S}
+    
     try make prefix=${D}/usr install
 
     dodoc CHANGELOG FIREWALL-PROXY-README LICENSE.txt
diff --git a/net-im/licq/licq-1.0.3.ebuild b/net-im/licq/licq-1.0.3.ebuild
index f70a57faf32b..bfca7f485d39 100644
--- a/net-im/licq/licq-1.0.3.ebuild
+++ b/net-im/licq/licq-1.0.3.ebuild
@@ -13,7 +13,8 @@ SRC_URI="http://download.sourceforge.net/${PN}/${A}
 	 ftp://mirror.itcnet.ro/pub/${PN}/srcs/${A}"
 HOMEPAGE="http://www.licq.org"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/glibc
+        ssl ( >=dev-libs/openssl-0.9.6 )"
 
 src_unpack() {
   unpack ${A}
diff --git a/net-mail/qmail/qmail-1.03-r3.ebuild b/net-mail/qmail/qmail-1.03-r3.ebuild
index 7336c217a902..d7e96f995c21 100644
--- a/net-mail/qmail/qmail-1.03-r3.ebuild
+++ b/net-mail/qmail/qmail-1.03-r3.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-mail/qmail/qmail-1.03-r3.ebuild,v 1.1 2000/12/18 21:24:16 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/qmail-1.03-r3.ebuild,v 1.2 2001/05/28 05:24:13 achim Exp $
 
 S=${WORKDIR}/qmail-1.03
 DESCRIPTION="A modern replacement for sendmail which uses maildirs"
@@ -13,8 +13,8 @@ QMAIL_SRC="http://cr.yp.to/software/qmail-1.03.tar.gz
 MYSQL_SRC="http://iain.cx/unix/qmail/qmail-mysql.patch"
 LDAP_SRC="http://www.nrg4u.com/qmail/qmail-ldap-1.03-20001201.patch.gz"
 
-QMAIL_DEP=">=sys-apps/bash-2.04
-           >=sys-libs/glibc-2.1.3"
+QMAIL_DEP="virtual/glibc"
+
 MYSQL_DEP=">=dev-db/mysql-3.23.28"
 LDAP_DEP=">=net-nds/openldap-1.2.11"
 
@@ -38,6 +38,9 @@ else
 fi
 
 PROVIDE="virtual/mta"
+RDEPEND="$DEPEND"
+DEPEND="$DEPEND sys-apps/groff"
+
 
 
 src_unpack() {
diff --git a/net-misc/clockspeed/clockspeed-0.62-r1.ebuild b/net-misc/clockspeed/clockspeed-0.62-r1.ebuild
index 6c6c80b81f4a..1dfd723d83be 100644
--- a/net-misc/clockspeed/clockspeed-0.62-r1.ebuild
+++ b/net-misc/clockspeed/clockspeed-0.62-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 Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/net-misc/clockspeed/clockspeed-0.62-r1.ebuild,v 1.2 2001/05/01 22:24:04 pete Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/clockspeed/clockspeed-0.62-r1.ebuild,v 1.3 2001/05/28 05:24:13 achim Exp $
 
 #P=
 A=${P}.tar.gz
@@ -10,7 +10,9 @@ DESCRIPTION="a simple ntp client"
 SRC_URI="http://cr.yp.to/clockspeed/clockspeed-0.62.tar.gz"
 HOMEPAGE="http://cr.yp.to/"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/glibc sys-apps/groff"
+
+RDEPEND="virtual/glibc"
 
 src_unpack() {
     unpack ${A}
diff --git a/net-misc/dhcp/dhcp-3.0_beta0224.ebuild b/net-misc/dhcp/dhcp-3.0_beta0224.ebuild
index fbe344ad44a2..ecfbdf34a222 100644
--- a/net-misc/dhcp/dhcp-3.0_beta0224.ebuild
+++ b/net-misc/dhcp/dhcp-3.0_beta0224.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-misc/dhcp/dhcp-3.0_beta0224.ebuild,v 1.4 2001/04/18 22:44:40 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.0_beta0224.ebuild,v 1.5 2001/05/28 05:24:13 achim Exp $
 
 P=dhcp-3.0b2pl24
 A="${P}.tar.gz"
@@ -10,7 +10,8 @@ DESCRIPTION="ISC Dynamic Host Configuration Protocol"
 SRC_URI="ftp://ftp.isc.org/isc/dhcp/${P}.tar.gz"
 HOMEPAGE="http://www.isc.org/products/DHCP/"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/glibc sys-apps/groff"
+RDEPEND="virtual/glibc"
 src_unpack() {
     unpack ${A}
     cd ${S}/includes
diff --git a/net-misc/djbdns/djbdns-1.05.ebuild b/net-misc/djbdns/djbdns-1.05.ebuild
index 8d9f407ffc7c..d490a45c4078 100644
--- a/net-misc/djbdns/djbdns-1.05.ebuild
+++ b/net-misc/djbdns/djbdns-1.05.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2001 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-misc/djbdns/djbdns-1.05.ebuild,v 1.1 2001/03/21 08:22:47 ryan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/djbdns/djbdns-1.05.ebuild,v 1.2 2001/05/28 05:24:13 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -9,7 +9,8 @@ DESCRIPTION="Excellent high-performance DNS services"
 SRC_URI="http://cr.yp.to/djbdns/${A}"
 HOMEPAGE="http://cr.yp.to/djbdns.html"
 
-DEPEND=">=sys-libs/glibc-2.1.3 >=sys-apps/daemontools-0.70"
+DEPEND="virtual/glibc"
+RDEPEND="virtual/glibc >=sys-apps/daemontools-0.70"
 
 src_unpack() {
 	unpack ${A}
diff --git a/net-misc/ipchains-firewall/ipchains-firewall-1.7.0-r1.ebuild b/net-misc/ipchains-firewall/ipchains-firewall-1.7.0-r1.ebuild
index 1a41035336e8..0e26a0ae732f 100644
--- a/net-misc/ipchains-firewall/ipchains-firewall-1.7.0-r1.ebuild
+++ b/net-misc/ipchains-firewall/ipchains-firewall-1.7.0-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-misc/ipchains-firewall/ipchains-firewall-1.7.0-r1.ebuild,v 1.3 2000/11/01 04:44:21 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ipchains-firewall/ipchains-firewall-1.7.0-r1.ebuild,v 1.4 2001/05/28 05:24:13 achim Exp $
 
 P=ipchains-firewall-1.7.0
 A=${P}.tar.gz
@@ -10,7 +10,7 @@ DESCRIPTION="IP-Chains Firewall Script "
 SRC_URI="http://firewall.langistix.com/download/"${A}
 HOMEPAGE="http://firewall.langistix.com/"
 
-DEPEND=">=sys-apps/bash-2.04"
+RDEPEND="sys-devel/perl"
 
 src_compile() {                           
   cd ${S}
diff --git a/net-misc/netkit-talk/netkit-talk-0.17-r2.ebuild b/net-misc/netkit-talk/netkit-talk-0.17-r2.ebuild
index 7825ec0e64f4..415301b8df3e 100644
--- a/net-misc/netkit-talk/netkit-talk-0.17-r2.ebuild
+++ b/net-misc/netkit-talk/netkit-talk-0.17-r2.ebuild
@@ -1,26 +1,25 @@
 # 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-misc/netkit-talk/netkit-talk-0.17-r2.ebuild,v 1.1 2001/04/29 22:09:53 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-talk/netkit-talk-0.17-r2.ebuild,v 1.2 2001/05/28 05:24:13 achim Exp $
 
-P=netkit-talk-0.17
-A=netkit-ntalk-0.17.tar.gz
-S=${WORKDIR}/netkit-ntalk-0.17
+A=netkit-ntalk-${PV}.tar.gz
+S=${WORKDIR}/netkit-ntalk-${PV}
 DESCRIPTION="Netkit - talkd"
 SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${A}"
 
-DEPEND=">=sys-libs/glibc-2.1.3
-	>=sys-libs/gpm-1.19.3
-	>=sys-libs/ncurses-5.1"
+DEPEND="virtual/glibc
+	>=sys-libs/ncurses-5.2"
 
 src_unpack() {
     unpack ${A}
-    
     patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
 }
 
 src_compile() {
-    try ./configure                           
+    try ./configure
+    cp MCONFIG MCONFIG.orig
+    sed -e "s:-O2 -Wall:-Wall:" -e "s:-Wpointer-arith::" MCONFIG.orig > MCONFIG
     try make
 }
 
@@ -31,7 +30,7 @@ src_install() {
 	dosbin talkd/talkd
 	dosym  talkd /usr/sbin/in.talkd
 	doman  talkd/talkd.8
-	dosym  talkd.8.gz /usr/man/man8/in.talkd.8.gz
+	dosym  talkd.8.gz /usr/share/man/man8/in.talkd.8.gz
 	dodoc  README ChangeLog BUGS
 }
 
diff --git a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r1.ebuild b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r1.ebuild
index 7a43e0c285f9..5e23d7af59ee 100644
--- a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r1.ebuild
+++ b/net-misc/netkit-telnetd/netkit-telnetd-0.17-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-misc/netkit-telnetd/netkit-telnetd-0.17-r1.ebuild,v 1.4 2000/11/01 04:44:22 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-telnetd/netkit-telnetd-0.17-r1.ebuild,v 1.5 2001/05/28 05:24:13 achim Exp $
 
 P=netkit-telnetd-0.17
 A=netkit-telnet-0.17.tar.gz
@@ -9,20 +9,19 @@ S=${WORKDIR}/netkit-telnet-0.17
 DESCRIPTION="Standard Linux telnet client"
 SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${A}"
 
-DEPEND=">=sys-libs/glibc-2.1.3
-	>=sys-libs/gpm-1.19.3
-	>=sys-libs/ncurses-5.1"
+DEPEND="virtual/glibc
+	>=sys-libs/ncurses-5.2"
 
 src_compile() {                           
     try ./configure --prefix=/usr
     cp MCONFIG MCONFIG.orig
-    sed -e "s/-pipe -O2/${CFLAGS}/" MCONFIG.orig > MCONFIG
+    sed -e "s/-pipe -O2/${CFLAGS}/" -e "s:-Wpointer-arith::" MCONFIG.orig > MCONFIG
     try make
     cd telnetlogin
     try make
 }
 
-src_install() {                               
+src_install() {
     into /usr
     dobin telnet/telnet
     dosbin telnetd/telnetd
@@ -30,8 +29,8 @@ src_install() {
     dosbin telnetlogin/telnetlogin
     doman telnet/telnet.1
     doman telnetd/*.8
-    dosym telentd.8.gz /usr/man/man8/in.telnetd.8.gz
-    doman telnetlogin/telnetlogin.8 
+    dosym telentd.8.gz /usr/share/man/man8/in.telnetd.8.gz
+    doman telnetlogin/telnetlogin.8
     dodoc BUGS ChangeLog README
     newdoc telnet/README README.telnet
     newdoc telnet/TODO TODO.telnet
diff --git a/net-misc/netkit-timed/netkit-timed-0.17-r2.ebuild b/net-misc/netkit-timed/netkit-timed-0.17-r2.ebuild
index 543c453dccac..04135a25c8da 100644
--- a/net-misc/netkit-timed/netkit-timed-0.17-r2.ebuild
+++ b/net-misc/netkit-timed/netkit-timed-0.17-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 Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-timed/netkit-timed-0.17-r2.ebuild,v 1.2 2001/05/09 04:37:31 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-timed/netkit-timed-0.17-r2.ebuild,v 1.3 2001/05/28 05:24:13 achim Exp $
 
 P=netkit-timed-0.17
 A=${P}.tar.gz
@@ -9,8 +9,7 @@ S=${WORKDIR}/${P}
 DESCRIPTION="Netkit - timed"
 SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${A}"
 
-DEPEND=">=sys-apps/bash-2.04
-	>=sys-libs/glibc-2.1.3"
+DEPEND="virtual/glibc"
 
 src_unpack() {
     unpack ${A}
diff --git a/net-nds/portmap/portmap-5b-r1.ebuild b/net-nds/portmap/portmap-5b-r1.ebuild
index a74bb04c81fb..83d8815f1158 100644
--- a/net-nds/portmap/portmap-5b-r1.ebuild
+++ b/net-nds/portmap/portmap-5b-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-nds/portmap/portmap-5b-r1.ebuild,v 1.4 2000/11/01 04:44:22 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/portmap/portmap-5b-r1.ebuild,v 1.5 2001/05/28 05:24:13 achim Exp $
 
 P=portmap-5b
 A=portmap_5beta.tar.gz
@@ -11,8 +11,7 @@ DESCRIPTION="Netkit - portmapper"
 SRC_URI="ftp://ftp.porcupine.org/pub/security/"${A}
 HOMEPAGE="ftp://ftp.porcupine.org/pub/security/index.html"
 
-DEPEND=">=sys-apps/bash-2.04
-	>=sys-libs/glibc-2.1.3"
+DEPEND="virtual/glibc sys-apps/tcp-wrappers"
 
 src_compile() {
     try make
diff --git a/net-print/LPRng/LPRng-3.6.26.ebuild b/net-print/LPRng/LPRng-3.6.26.ebuild
index d3a3932f2e5e..407b6cde0bab 100644
--- a/net-print/LPRng/LPRng-3.6.26.ebuild
+++ b/net-print/LPRng/LPRng-3.6.26.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-print/LPRng/LPRng-3.6.26.ebuild,v 1.3 2001/02/01 19:30:33 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/LPRng/LPRng-3.6.26.ebuild,v 1.4 2001/05/28 05:24:13 achim Exp $
 
 A=${P}.tgz
 S=${WORKDIR}/${P}
@@ -11,8 +11,8 @@ HOMEPAGE="http://www.astart.com/LPRng/LPRng.html"
 
 PROVIDE="virtual/lpr"
 
-DEPEND=">=sys-libs/glibc-2.1.3"
-
+DEPEND="virtual/glibc >=sys-libs/ncurses-5.2 >=sys-apps/procps-2.0.6"
+RDEPEND="virtual/glibc >=sys-libs/ncurses-5.2"
 src_unpack() {
   unpack ${A}
   cd ${S}/po
@@ -21,14 +21,14 @@ src_unpack() {
   rm -rf ${S}/intl
 }
 
-src_compile() {                           
+src_compile() {
   cd ${S}
   try ./configure --host=${CHOST} --prefix=/usr --sysconfdir=/etc/lprng \
 	--enable-nls --with-included-gettext
   try make
 }
 
-src_install() {                               
+src_install() {
   cd ${S}
   try make INSTALL_PREFIX=${D} datadir=${D}/usr/share \
 		gnulocaledir=${D}/usr/share/locale \
diff --git a/sys-apps/busybox/busybox-0.50.ebuild b/sys-apps/busybox/busybox-0.50.ebuild
index 0712f7029614..34baff2b785d 100644
--- a/sys-apps/busybox/busybox-0.50.ebuild
+++ b/sys-apps/busybox/busybox-0.50.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/busybox/busybox-0.50.ebuild,v 1.2 2001/05/09 02:59:45 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-0.50.ebuild,v 1.3 2001/05/28 05:24:13 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -9,6 +9,8 @@ DESCRIPTION="Utilities for rescue and embedded systems"
 SRC_URI="ftp://oss.lineo.com/busybox/${A}"
 HOMEPAGE="http://busybox.lineo.com/"
 
+DEPEND="virtual/glibc"
+
 src_unpack() {
     unpack ${A}
     cp ${FILESDIR}/Config.h ${S}/Config.h
diff --git a/sys-apps/console-tools/console-tools-0.2.3-r3.ebuild b/sys-apps/console-tools/console-tools-0.2.3-r3.ebuild
index 24e9519577e7..1a830bbbe4e9 100644
--- a/sys-apps/console-tools/console-tools-0.2.3-r3.ebuild
+++ b/sys-apps/console-tools/console-tools-0.2.3-r3.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/console-tools/console-tools-0.2.3-r3.ebuild,v 1.3 2001/04/07 16:16:44 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/console-tools/console-tools-0.2.3-r3.ebuild,v 1.4 2001/05/28 05:24:13 achim Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Console and font utilities"
@@ -9,9 +9,7 @@ SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/keyboards/${P}.tar.gz"
 HOMEPAGE="http://altern.org/ydirson/en/lct/"
 
 DEPEND="virtual/glibc
-        sys-devel/automake
-        >=sys-devel/flex-2.5.4a-r2
-        nls? ( sys-devel/gettext ) sys-devel/autoconf"
+        nls? ( sys-devel/gettext )"
 RDEPEND="virtual/glibc"
 
 src_unpack() {
diff --git a/sys-apps/procps/procps-2.0.6-r1.ebuild b/sys-apps/procps/procps-2.0.6-r1.ebuild
index f657d53b6841..b817f5282c0d 100644
--- a/sys-apps/procps/procps-2.0.6-r1.ebuild
+++ b/sys-apps/procps/procps-2.0.6-r1.ebuild
@@ -1,15 +1,13 @@
 # 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/procps/procps-2.0.6-r1.ebuild,v 1.4 2001/05/16 23:23:56 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-2.0.6-r1.ebuild,v 1.5 2001/05/28 05:24:13 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Standard informational utilities and process-handling tools"
 SRC_URI="ftp://people.redhat.com/johnsonm/procps/${A}"
-DEPEND=">=sys-libs/ncurses-5.2-r2
-        sys-libs/getext"
-DEPEND=">=sys-libs/ncurses-5.2-r2"
+DEPEND="virtual/glibc >=sys-libs/ncurses-5.2-r2"
 
 src_unpack() {
 
@@ -44,8 +42,7 @@ src_install() {
     dodir /usr/share/man/man{1,5,8}
     dodir /lib
     dodir /bin
-    try make DESTDIR=${D} MAN1DIR=/usr/share/man/man1 \
-	MAN8DIR=/usr/share/man/man8 install
+    try make DESTDIR=${D} install
 
     preplib /
     dodoc BUGS COPYING COPYING.LIB NEWS TODO
diff --git a/sys-apps/psmisc/psmisc-19-r2.ebuild b/sys-apps/psmisc/psmisc-19-r2.ebuild
index 2012bef4dd15..513a6b7c3233 100644
--- a/sys-apps/psmisc/psmisc-19-r2.ebuild
+++ b/sys-apps/psmisc/psmisc-19-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-apps/psmisc/psmisc-19-r2.ebuild,v 1.1 2001/02/07 15:51:28 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/psmisc/psmisc-19-r2.ebuild,v 1.2 2001/05/28 05:24:13 achim Exp $
 
 #from Debian ;)
 
@@ -9,7 +9,7 @@ A=${P}.tar.gz
 S=${WORKDIR}/psmisc
 DESCRIPTION="Handy process-related utilities from Debian"
 SRC_URI="ftp://lrcftp.epfl.ch/pub/linux/local/psmisc/"${A}
-DEPEND=">=sys-libs/ncurses-5.2-r2"
+DEPEND="virtual/glibc >=sys-libs/ncurses-5.2-r2"
 
 src_unpack() {
     unpack ${A}
diff --git a/sys-apps/texinfo/texinfo-4.0-r2.ebuild b/sys-apps/texinfo/texinfo-4.0-r2.ebuild
index 738cd7ed1867..3a8cd9fe2035 100644
--- a/sys-apps/texinfo/texinfo-4.0-r2.ebuild
+++ b/sys-apps/texinfo/texinfo-4.0-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 Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/texinfo-4.0-r2.ebuild,v 1.2 2001/02/27 12:11:44 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/texinfo-4.0-r2.ebuild,v 1.3 2001/05/28 05:24:13 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -9,10 +9,10 @@ DESCRIPTION="The GNU info program and utilities"
 SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/texinfo/${A}
 	 ftp://ftp.gnu.org/pub/gnu/texinfo/${A}"
 
-DEPEND=">=sys-libs/ncurses-5.2-r2
+DEPEND="virtual/glibc >=sys-libs/ncurses-5.2-r2
         nls? ( sys-devel/gettext )"
 
-RDEPEND=">=sys-libs/ncurses-5.2-r2"
+RDEPEND="virtual/glibc >=sys-libs/ncurses-5.2-r2"
 
 src_compile() {
     local myconf
diff --git a/sys-apps/util-linux/util-linux-2.11b.ebuild b/sys-apps/util-linux/util-linux-2.11b.ebuild
index d9280c9dd74a..967e42f614d0 100644
--- a/sys-apps/util-linux/util-linux-2.11b.ebuild
+++ b/sys-apps/util-linux/util-linux-2.11b.ebuild
@@ -1,13 +1,13 @@
 # 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/util-linux/util-linux-2.11b.ebuild,v 1.1 2001/05/08 01:10:53 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.11b.ebuild,v 1.2 2001/05/28 05:24:13 achim Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Various useful Linux utilities"
 SRC_URI="ftp://ftp.win.tue.nl/pub/linux-local/utils/util-linux/${P}.tar.gz"
-DEPEND=">=sys-libs/ncurses-5.2-r2"
 
+DEPEND="virtual/glibc >=sys-libs/ncurses-5.2-r2"
 
 RDEPEND="$DEPEND
 	 sys-devel/perl"
diff --git a/sys-apps/vim-nogui/vim-nogui-5.7-r4.ebuild b/sys-apps/vim-nogui/vim-nogui-5.7-r4.ebuild
index bc17fcfb7717..8f096399bdf9 100644
--- a/sys-apps/vim-nogui/vim-nogui-5.7-r4.ebuild
+++ b/sys-apps/vim-nogui/vim-nogui-5.7-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 Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/vim-nogui/vim-nogui-5.7-r4.ebuild,v 1.3 2001/05/13 11:31:48 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/vim-nogui/vim-nogui-5.7-r4.ebuild,v 1.4 2001/05/28 05:24:13 achim Exp $
 
 A="vim-5.7-src.tar.gz vim-5.7-rt.tar.gz"
 S=${WORKDIR}/vim-5.7
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.home.vim.org/pub/vim/unix/vim-5.7-src.tar.gz
 	 ftp://ftp.home.vim.org/pub/vim/unix/vim-5.7-rt.tar.gz"
 HOMEPAGE="http://www.vim.org"
 
-DEPEND=">=sys-libs/ncurses-5.2-r2
+DEPEND="virtual/glibc >=sys-libs/ncurses-5.2-r2
         gpm? ( >=sys-libs/gpm-1.19.3 )"
 if [ "`use build`" ] ; then
     RDEPEND="virtual/glibc"
diff --git a/sys-devel/gdb/gdb-5.0-r2.ebuild b/sys-devel/gdb/gdb-5.0-r2.ebuild
index cf8926283849..499dea397d82 100644
--- a/sys-devel/gdb/gdb-5.0-r2.ebuild
+++ b/sys-devel/gdb/gdb-5.0-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 Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-5.0-r2.ebuild,v 1.6 2001/05/16 14:16:48 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-5.0-r2.ebuild,v 1.7 2001/05/28 05:24:13 achim Exp $
 
 A=${P}.tar.bz2
 S=${WORKDIR}/${P}
@@ -9,10 +9,10 @@ DESCRIPTION="GNU debugger"
 SRC_URI="ftp://sourceware.cygnus.com/pub/gdb/releases/${A}
 	 ftp://ftp.freesoftware.com/pub/sourceware/gdb/releases/${A}"
 
-DEPEND=">=sys-libs/ncurses-5.2-r2
+DEPEND="virtual/glibc >=sys-libs/ncurses-5.2-r2
         nls? ( sys-devel/gettext )"
 
-RDEPEND=">=sys-libs/ncurses-5.2-r2"
+RDEPEND="virtual/glibc >=sys-libs/ncurses-5.2-r2"
 
 HOMEPAGE="http://www.gnu.org/software/gdb/gdb.html"