Prepared for rc3

13 files changed, 120 insertions, 135 deletions

diff --git a/sys-libs/cracklib/cracklib-2.7-r1.ebuild b/sys-libs/cracklib/cracklib-2.7-r1.ebuild
index 91d728181596..a5796fbbe823 100644
--- a/sys-libs/cracklib/cracklib-2.7-r1.ebuild
+++ b/sys-libs/cracklib/cracklib-2.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/sys-libs/cracklib/cracklib-2.7-r1.ebuild,v 1.7 2000/11/12 21:35:07 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.7-r1.ebuild,v 1.8 2000/11/30 23:14:00 achim Exp $
 
 A=cracklib2_2.7.orig.tar.gz
 A0=${P}-redhat.patch
@@ -9,21 +9,20 @@ S=${WORKDIR}/cracklib,2.7
 DESCRIPTION="Cracklib"
 SRC_URI="ftp://ftp.debian.org/debian/dists/potato/main/source/utils/cracklib2_2.7.orig.tar.gz"
 
-DEPEND="|| ( sys-libs/glibc-2.1.3-r3 sys-libs/glibc-2.2 )"
-RDEPEND=">=sys-libs/glibc-2.1.3
+DEPEND=">=sys-libs/glibc-2.1.3"
+RDEPEND="$DEPEND
 	 >=sys-apps/bash-2.04"
 
 src_unpack() {
   unpack ${A}
   cd ${S}
   patch -p1 <${O}/files/${A0}
-  cp Makefile Makefile.orig
-#  sed -e "s/DICTPATH=.*/DICTPATH=\"\/usr\/share\/cracklib\/pw_dict\"/" Makefile.orig > Makefile
 }
 
-src_compile() { 
+src_compile() {
   cd ${S}
-  try make all                         
+  # Parallel mke not supported
+  try make DICTPATH=\"/usr/share/cracklib/pw_dict\" all                         
 }
 
 src_install() {                               
@@ -32,7 +31,8 @@ src_install() {
   dodir /usr/lib
   dodir /usr/sbin
   dodir /usr/include
-  ROOT=${D} try make install
+  dodir /usr/share/cracklib
+  ROOT=${D} try make DICTPATH=\"/usr/share/cracklib/pw_dict\" install
   preplib /usr
   dodoc HISTORY LICENCE MANIFEST POSTER README
 }
diff --git a/sys-libs/db/db-1.85.ebuild b/sys-libs/db/db-1.85.ebuild
index 09c27fb69fdd..67af07391ace 100644
--- a/sys-libs/db/db-1.85.ebuild
+++ b/sys-libs/db/db-1.85.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/db/db-1.85.ebuild,v 1.3 2000/11/25 13:13:30 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-1.85.ebuild,v 1.4 2000/11/30 23:14:00 achim Exp $
 
 A=db.1.85.tar.gz
 S=${WORKDIR}/db.1.85
@@ -18,7 +18,7 @@ src_unpack() {
 
 src_compile() {
     cd ${S}/PORT/linux
-    try make OORG=\"${CFLAGS} -fomit-frame-pointer\" prefix=/usr
+    try make ${MAKEOPTS} OORG=\"${CFLAGS} -fomit-frame-pointer\" prefix=/usr
 }
 
 src_install () {
@@ -36,6 +36,13 @@ src_install () {
 	dosed "s:<db.h>:<db1/db.h>;" /usr/include/ndbm.h
 	cp db_dump185 db1_dump185
 	dobin db1_dump185
+	cd ${S}
+	dodoc changelog README
+	docinto ps
+	dodoc docs/*.ps
+	docinto hash
+	dodoc hash/README
+	
 }
 
 
diff --git a/sys-libs/db/db-3.1.17-r1.ebuild b/sys-libs/db/db-3.1.17-r1.ebuild
index a28f0e3d585e..7a1b6e08e23e 100644
--- a/sys-libs/db/db-3.1.17-r1.ebuild
+++ b/sys-libs/db/db-3.1.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/sys-libs/db/db-3.1.17-r1.ebuild,v 1.2 2000/11/17 10:11:33 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-3.1.17-r1.ebuild,v 1.3 2000/11/30 23:14:00 achim Exp $
 
 A=${P}-patched.tar.gz
 S=${WORKDIR}/${P}-patched/build_unix
@@ -9,14 +9,16 @@ DESCRIPTION="Berkeley DB for transaction support in MySQL"
 SRC_URI="ftp://mysql.valueclick.com/mysql/Downloads/db/${A}
 	 http://download.sourceforge.net/pub/mirrors/mysql/Downloads/db/${A}"
 HOMEPAGE="http://www.mysql.com"
-DEPEND=">=sys-libs/glibc-2.2 !sys-libs/glibc-2.1.3 =sys-libs/db-1.85"
-
+RDEPEND=">=sys-libs/glibc-2.2 !sys-libs/glibc-2.1.3"
+DEPEND="$RDEPEND
+	=sys-libs/db-1.85"
 src_compile() {
 
     cd ${S}
     try ../dist/configure --enable-compat185 --enable-dump185 --prefix=/usr --host=${CHOST} --enable-shared --enable-static --enable-rpc --enable-cxx
 
 	echo
+    # Parallel make does not work
     echo "Building static libs..."
     make libdb=libdb-3.1.a libdb-3.1.a
 	make libcxx=libdb_cxx-3.1.a libdb_cxx-3.1.a
@@ -28,7 +30,7 @@ src_compile() {
 	
 	echo
 	echo "Building everything else..."
-	try make libdb=libdb-3.1.a libcxx=libdb_cxx-3.1.a LDFLAGS="-s"	
+	try make libdb=libdb-3.1.a libcxx=libdb_cxx-3.1.a 	
 }
 
 src_install () {
@@ -39,6 +41,7 @@ src_install () {
 	cd ..
 	dodoc README LICENSE
 	mv ${D}/usr/docs ${D}/usr/doc/${PF}/html
+	prepalldocs
 	dodir usr/include/db3
 	cd ${D}/usr/include
 	mv *.h db3
diff --git a/sys-libs/gdbm/gdbm-1.8.0-r1.ebuild b/sys-libs/gdbm/gdbm-1.8.0-r1.ebuild
index a05effef9889..8859d4396425 100644
--- a/sys-libs/gdbm/gdbm-1.8.0-r1.ebuild
+++ b/sys-libs/gdbm/gdbm-1.8.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 Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gdbm/gdbm-1.8.0-r1.ebuild,v 1.5 2000/11/07 11:16:08 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gdbm/gdbm-1.8.0-r1.ebuild,v 1.6 2000/11/30 23:14:00 achim Exp $
 
 # FOR SOME REASON, THE CONFIGURE SCRIPT DOES NOT USE THE EXPORTED CFLAGS, SO
 # THIS LIBRARY ONLY HAS -O OPTS, WE WON'T WORRY ABOUT THIS FOR SUCH AN 
@@ -21,19 +21,11 @@ RDEPEND=$DEPEND
 
 src_compile() {                           
     try ./configure --host=${CHOST} --prefix=/usr
-    try make
+    try pmake 
 }
 
-src_install() {                               
-    into /usr
-    dolib.a libgdbm.la .libs/libgdbm.a
-    dolib.so .libs/libgdbm.so.2.0.0
-    dosym libgdbm.so.2.0.0 /usr/lib/libgdbm.so.2
-    dosym libgdbm.so.2.0.0 /usr/lib/libgdbm.so
-    insinto /usr/include
-    doins gdbm.h
-    doman gdbm.3
-    doinfo gdbm.info
+src_install() {      
+    try make prefix=${D}/usr install                         
     dodoc COPYING ChangeLog NEWS README
 }
 
diff --git a/sys-libs/glibc/glibc-2.2-r2.ebuild b/sys-libs/glibc/glibc-2.2-r2.ebuild
index 5779c00b4ea5..1fd168ca6c3f 100644
--- a/sys-libs/glibc/glibc-2.2-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.2-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-libs/glibc/glibc-2.2-r2.ebuild,v 1.4 2000/11/17 01:03:07 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2-r2.ebuild,v 1.5 2000/11/30 23:14:00 achim Exp $
 
 A="$P.tar.gz glibc-linuxthreads-${PV}.tar.gz"
 S=${WORKDIR}/${P}
@@ -13,6 +13,10 @@ SRC_URI="ftp://sourceware.cygnus.com/pub/glibc/releases/glibc-${PV}.tar.gz
 	 ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.gz
 	 ftp://ftp.gnu.org/pub/gnu/glibc/glibc-linuxthreads-${PV}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
+DEPEND=""
+RDEPEND="$DEPEND
+	 >=sys-apps/bash-2.04
+	 >=sys-devel/perl-5.6"
 
 src_compile() {                           
 
@@ -20,11 +24,11 @@ src_compile() {
 	mkdir buildhere
 	cd buildhere
 	try ../configure --host=${CHOST} --without-cvs \
-		--enable-add-ons=linuxthreads,crypt,localedata \
+		--enable-add-ons=linuxthreads \
 		--disable-profile --prefix=/usr \
 		--enable-kernel=2.2.17
-	try make
-	make check
+	try make PARALLELMFLAGS=${MAKEOPTS}
+#	make check
 }
 
 src_unpack() {
@@ -40,41 +44,20 @@ src_install() {
     mkdir ${D}	
     dodir /etc/rc.d/init.d
     export LC_ALL=C
-    try make install_root=${D} install -C buildhere
-    try make install_root=${D} info -C buildhere
-    try make install_root=${D} localedata/install-locales -C buildhere
-    try make -C linuxthreads/man
+    try make PARALELLMFLAGS=${MAKEOPTS} install_root=${D} install -C buildhere
+    try make PARALELLMFLAGS=${MAKEOPTS} install_root=${D} info -C buildhere
+    try make PARALELLMFLAGS=${MAKEOPTS} install_root=${D} localedata/install-locales -C buildhere
+    try make  PARALELLMFLAGS=${MAKEOPTS} -C linuxthreads/man
     mkdir -p ${D}/usr/man/man3
     install -m 0644 linuxthreads/man/*.3thr ${D}/usr/man/man3
     chmod 755 ${D}/usr/libexec/pt_chown
     install -m 644 nscd/nscd.conf ${D}/etc
     install -m 755 ${O}/files/nscd ${D}/etc/rc.d/init.d/nscd
-    dodir /var/db
-    install -m 644 nss/db-Makefile ${D}/var/db/Makefile
     rm ${D}/lib/ld-linux.so.2
     rm ${D}/lib/libc.so.6
-    rm -rf documentation
-    mkdir documentation
-    mkdir documentation/html
-    cp linuxthreads/ChangeLog  documentation/ChangeLog.threads
-    cp linuxthreads/Changes documentation/Changes.threads
-    cp linuxthreads/README documentation/README.threads
-    cp linuxthreads/FAQ.html documentation/html/FAQ-threads.html
-    cp crypt/README documentation/README.crypt
-    cp db2/README documentation/README.db2
-    cp db2/mutex/README documentation/README.db2.mutex
-    cp timezone/README documentation/README.timezone
-    cp ChangeLog* documentation
-    dodoc documentation/*
-    docinto html
-    dodoc documentation/html/*.html
-    dodir /usr/doc/${PF}/examples.threads
-    install -m0644 linuxthreads/Examples/*.c ${D}/usr/doc/${PF}/examples.threads
-    install -m0644 linuxthreads/Examples/Makefile ${D}/usr/doc/${PF}/examples.threads
-    # Patch ucontext.h (needed for lynx, xfree)
-    #cd ${D}/usr/include/sys
-    #cp ucontext.h ucontext.h.orig
-    #sed -e "s/ERR/GLIBCBUG/g" ucontext.h.orig > ucontext.h
+
+    dodoc BUGS ChangeLog* CONFORMANCE COPYING* FAQ INTERFACE NEWS NOTES \
+	  PROJECTS README*
 }
 
 pkg_preinst()
diff --git a/sys-libs/gpm/gpm-1.19.3.ebuild b/sys-libs/gpm/gpm-1.19.3.ebuild
index c66fd4ee6007..f5d4646c2c08 100644
--- a/sys-libs/gpm/gpm-1.19.3.ebuild
+++ b/sys-libs/gpm/gpm-1.19.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 Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/gpm-1.19.3.ebuild,v 1.4 2000/11/12 21:35:07 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/gpm-1.19.3.ebuild,v 1.5 2000/11/30 23:14:00 achim Exp $
 
 P=gpm-1.19.3
 A=${P}.tar.gz
@@ -22,25 +22,29 @@ src_unpack() {
 
 src_compile() { 
     cd ${S}                          
-    try ./configure --prefix=/usr
+    try ./configure --prefix=/usr --sysconfdir=/etc/gpm
     cp Makefile Makefile.orig
-    sed -e "s/doc//" Makefile.orig > Makefile
-    try make 
+    if [ -z "`use tex`" ]
+    then
+      sed -e "s/doc//" Makefile.orig > Makefile
+    fi
+    try make  ${MAKEOPTS}
 }
 
-src_install() {                               
-    into /usr
-    dolib.a libgpm.a
-    dolib.so libgpm.so.1.18.0
-    dosym libgpm.so.1.18.0 /usr/lib/libgpm.so.1
-    dosym libgpm.so.1.18.0 /usr/lib/libgpm.so
-    dosbin gpm
-    dobin disable-paste gpm-root mev
-    insinto /usr/include
-    doins gpm.h
-    dodoc Announce COPYING ChangeLog FAQ MANIFEST README.* doc/gpmdoc.txt
-    doinfo doc/gpm.info
-    doman doc/*.1 doc/*.8 doc/*.7
+src_install() {  
+    try make prefix=${D}/usr install   
+    chmod 755 ${D}/usr/lib/libgpm.so.1.18.0           
+    dodoc Announce COPYING ChangeLog FAQ MANIFEST README.* 
+    docinto txt
+    dodoc doc/gpmdoc.txt
+    if [ "`use tex`" ]
+    then
+      docinto ps
+      dodoc doc/*.ps
+    fi
+    insinto /etc/gpm
+    doins gpm-root.conf
+    
 }
 
 
diff --git a/sys-libs/ncurses/ncurses-5.2.ebuild b/sys-libs/ncurses/ncurses-5.2.ebuild
index b9763d65b639..0124bcf09089 100644
--- a/sys-libs/ncurses/ncurses-5.2.ebuild
+++ b/sys-libs/ncurses/ncurses-5.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 Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.2.ebuild,v 1.2 2000/11/27 15:12:34 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.2.ebuild,v 1.3 2000/11/30 23:14:00 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -9,20 +9,19 @@ DESCRIPTION="Linux console display libarary"
 SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/ncurses/${A}
 	 ftp://ftp.gnu.org/pub/gnu/ncurses/${A}"
 HOMEPAGE="http://www.gnu.org/software/ncurses/ncurses.html"
+DEPEND=">=sys-libs/gpm-1.19.3"
 
 src_compile() {  
-	try ./configure --prefix=/usr --enable-symlinks --disable-termcap \
-	--with-gpm --with-shared --without-debug --with-rcs-ids --host=${CHOST}
-	try make
+	try ./configure --prefix=/usr --libdir=/lib --enable-symlinks --disable-termcap \
+	--with-gpm --with-shared --with-libtool --without-debug --with-rcs-ids --host=${CHOST}
+	try make ${MAKEOPTS}
 }
 
 src_install() {                               
-	try make prefix=${D}/usr install ticdir=${D}/usr/share/terminfo
-	#move to root so that we can use ncurses on boot
-	cd ${D}/usr/lib
-	dodir /lib
-	mv *.so* ../../lib
-        preplib /
+	try make DESTDIR=${D} install 
+	cd ${D}/lib
+	ln -s libncurses.a libcurses.a
+	chmod 755 ${D}/lib/*.5.0.2
 	cd ${S}
 	dodoc ANNOUNCE MANIFEST NEWS README* TO-DO 
 	dodoc doc/*.doc
@@ -36,7 +35,6 @@ src_install() {
 	dodoc doc/html/ada/funcs/*.htm
 	docinto html/man
 	dodoc doc/html/man/*.html
-	gzip ${D}/usr/man/man1/tack.1
 }
 
 
diff --git a/sys-libs/nss-db/nss-db-2.2.ebuild b/sys-libs/nss-db/nss-db-2.2.ebuild
index 1fe9f4f1df90..fdc9b4438302 100644
--- a/sys-libs/nss-db/nss-db-2.2.ebuild
+++ b/sys-libs/nss-db/nss-db-2.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 Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/nss-db/nss-db-2.2.ebuild,v 1.2 2000/11/17 01:59:33 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/nss-db/nss-db-2.2.ebuild,v 1.3 2000/11/30 23:14:00 achim Exp $
 
 A=nss_db-2.2.tar.gz
 S=${WORKDIR}/nss_db-2.2
@@ -12,16 +12,15 @@ HOMEPAGE="http://www.gnu.org"
 DEPEND=">=sys-libs/db-3.1.17 >=sys-libs/glibc-2.2-r2"
 
 src_compile() {
-    try ./configure --with-db=/usr/include/db3 --prefix=/usr 
-    try make
+    try ./configure --with-db=/usr/include/db3 --prefix=/usr --libdir=/usr/lib
+    try make ${MAKEOPTS}
 }
 
 src_install () {
 	make DESTDIR=${D} install
-	cd ${D}
-	rm usr/lib/*
-	mv lib/* usr/lib
-	rm -rf lib
+	rm -rf ${D}/usr/lib
+	cd ${D}/lib
+	ln -s libnss_db-2.2.so libnss_db.so
 	cd ${S}
 	dodoc AUTHORS COPYING* ChangeLog NEWS README THANKS
 }
diff --git a/sys-libs/pam/pam-0.72-r1.ebuild b/sys-libs/pam/pam-0.72-r1.ebuild
index 3b0a37f9be72..895386caf3d6 100644
--- a/sys-libs/pam/pam-0.72-r1.ebuild
+++ b/sys-libs/pam/pam-0.72-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-libs/pam/pam-0.72-r1.ebuild,v 1.6 2000/11/13 21:29:59 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.72-r1.ebuild,v 1.7 2000/11/30 23:14:00 achim Exp $
 
 P=pam-0.72
 A=Linux-PAM-0.72.tar.gz
@@ -10,8 +10,8 @@ DESCRIPTION="PAM"
 SRC_URI="http://openrock.net/pub/linux/libs/pam/pre/library/${A}"
 HOMEPAGE="http://www.redhat.com/linux-info/pam/"
 
-DEPEND=">=sys-libs/cracklib-2.7"
-RDEPEND=$DEPEND
+DEPEND=">=sys-libs/cracklib-2.7
+	>=sys-libs/pwdb-0.61"
 
 src_unpack() {                           
   unpack ${A}
@@ -19,7 +19,7 @@ src_unpack() {
   touch .freezemake
   rm default.defs
   sed -e "s/CFLAGS=.*/CFLAGS=${CFLAGS} -pipe -D_REENTRANT/" \
-      -e "s:FAKEROOT=.*:FAKEROOT=${WORKDIR}/../image:" defs/linux.defs > default.defs
+      -e "s:FAKEROOT=.*:FAKEROOT=${D}:" defs/linux.defs > default.defs
   echo "EXTRALS=-lcrypt" >> default.defs
   cp Makefile Makefile.orig
   sed -e "s/DIRS = modules libpam/DIRS = libpam modules/" Makefile.orig > Makefile
@@ -29,8 +29,7 @@ src_unpack() {
   
 }
 src_compile() {
-  try make
-  try make
+  try make ${MAKEOPTS}
 }
 
 src_install() {                               
@@ -39,11 +38,20 @@ src_install() {
  try make install
  dosbin bin/pam_conv1
  dodoc CHANGELOG Copyright README 
- dodoc 
+ docinto modules
+ dodoc modules/README
+ cd modules
+ for i in pam_*
+ do
+   if [ -f $i/README ]
+   then
+     docinto modules/$i
+     dodoc $i/README
+   fi
+ done
+ doman doc/man/*.[38] 
  cd ${D}/usr/lib
- ln -sf libpamc.so.0.72 libpamc.so.0
- ln -sf libpam.so.0.72 libpam.so.0
- ln -sf libpam_misc.so.0.72 libpam_misc.so.0
+ preplib /usr
 }
 
 
diff --git a/sys-libs/pwdb/pwdb-0.61-r2.ebuild b/sys-libs/pwdb/pwdb-0.61-r2.ebuild
index c902375e419a..8fde74a6330c 100644
--- a/sys-libs/pwdb/pwdb-0.61-r2.ebuild
+++ b/sys-libs/pwdb/pwdb-0.61-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-libs/pwdb/pwdb-0.61-r2.ebuild,v 1.1 2000/11/20 22:16:46 jerry Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pwdb/pwdb-0.61-r2.ebuild,v 1.2 2000/11/30 23:14:00 achim Exp $
 
 P=pwdb-0.61
 A=${P}.tar.gz
@@ -22,7 +22,7 @@ src_compile() {
   cd ${S}
   cp Makefile Makefile.orig
   sed -e "s/^DIRS = .*/DIRS = libpwdb/" Makefile.orig > Makefile
-  try make
+  try make ${MAKEOPTS}
 }
 
 src_install() {                               
@@ -30,12 +30,14 @@ src_install() {
   into /usr
   dodir /usr/include/pwdb
   dodir /usr/lib
-  dodoc doc/pwdb.txt CHANGES Copyright CREDITS README
+  dodoc CHANGES Copyright CREDITS README
   docinto html
   dodoc doc/html/*
+  docinto txt
+  dodoc doc/*.txt
   insinto /etc
   doins conf/pwdb.conf
-  try make INCLUDED=${D}/usr/include/pwdb LIBDIR=${D}/usr/lib install
+  try make INCLUDED=${D}/usr/include/pwdb LIBDIR=${D}/usr/lib LDCONFIG="echo" install
   preplib /usr
 
   cd ${O}/files
diff --git a/sys-libs/readline/readline-4.1-r1.ebuild b/sys-libs/readline/readline-4.1-r1.ebuild
index 5dc1636ec2eb..9754ec038bae 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.5 2000/11/07 11:16:08 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-4.1-r1.ebuild,v 1.6 2000/11/30 23:14:00 achim Exp $
 
 P=readline-4.1
 A=${P}.tar.gz
@@ -16,10 +16,9 @@ RDEPEND=$DEPEND
 
 src_compile() {                           
     try ./configure --host=${CHOST} --with-curses --prefix=/usr
-    try make
+    try make ${MAKEOPTS}
     cd shlib
-    try make
-    cd ..
+    try make ${MAKEOPTS}
 
 }
 
@@ -29,16 +28,14 @@ src_install() {
 	cd shlib
 	try make prefix=${D}/usr install
 	cd ..
-	prepman
-	prepinfo
-	dodoc CHANGELOG CHANGES COPYING INSTALL MANIFEST README USAGE
+	dodoc CHANGELOG CHANGES COPYING MANIFEST README USAGE
+	docinto ps
 	dodoc doc/*.ps
 	docinto html
 	dodoc doc/*.html
-	dosym libhistory.so.4.1 /usr/lib/libhistory.so.4
 	dosym libhistory.so.4.1 /usr/lib/libhistory.so
-	dosym libreadline.so.4.1 /usr/lib/libreadline.so.4
 	dosym libreadline.so.4.1 /usr/lib/libreadline.so
+	chmod 755 ${D}/usr/lib/*.4.1
 }
 
 
diff --git a/sys-libs/slang/slang-1.4.2.ebuild b/sys-libs/slang/slang-1.4.2.ebuild
index 54e0aee170a9..758bcfd70d7b 100644
--- a/sys-libs/slang/slang-1.4.2.ebuild
+++ b/sys-libs/slang/slang-1.4.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 Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/slang-1.4.2.ebuild,v 1.3 2000/11/07 11:16:08 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/slang-1.4.2.ebuild,v 1.4 2000/11/30 23:14:00 achim Exp $
 
 P=slang-1.4.2
 A=${P}.tar.gz
@@ -10,11 +10,10 @@ DESCRIPTION="Console display library used by most text viewer"
 SRC_URI="ftp://space.mit.edu/pub/davis/slang/v1.4/${A}"
 
 DEPEND=">=sys-libs/glibc-2.1.3"
-RDEPEND=$DEPEND
 
 src_compile() {                           
     try ./configure --host=${CHOST} --prefix=/usr
-    try make elf
+    try make ${MAKEOPTS} prefix=${D}/usr elf
 }
 
 src_unpack() {
@@ -24,20 +23,14 @@ src_unpack() {
     sed -e "s/ELF_CFLAGS=\"-O2/ELF_CFLAGS=\"${CFLAGS}/" configure.orig > configure
 }
 
-src_install() {                               
-    into /usr
-    libopts -m0755
-    dolib src/elfobjs/libslang.so.1.4.2
-    dosym libslang.so.1.4.2 /usr/lib/libslang.so.1
-    dosym libslang.so.1 /usr/lib/libslang.so
+src_install() {    
+    try make ${MAKEOPTS} prefix=${D}/usr install-elf   
+    preplib /usr
+    rm -rf ${D}/usr/doc/slang                      
     dodoc COPYING* NEWS README *.txt
     dodoc doc/*.txt doc/internal/*.txt doc/text/*.txt
     docinto html
     dodoc doc/*.html
-    dodir /usr/include
-    insinto /usr/include
-    cd ${S}/src
-    doins slang.h slcurses.h
 }
 
 
diff --git a/sys-libs/zlib/zlib-1.1.3-r1.ebuild b/sys-libs/zlib/zlib-1.1.3-r1.ebuild
index d587c958821f..bae5b75391a7 100644
--- a/sys-libs/zlib/zlib-1.1.3-r1.ebuild
+++ b/sys-libs/zlib/zlib-1.1.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 Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.1.3-r1.ebuild,v 1.5 2000/11/07 11:16:08 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.1.3-r1.ebuild,v 1.6 2000/11/30 23:14:00 achim Exp $
 
 P=zlib-1.1.3
 A=${P}.tar.gz
@@ -15,10 +15,10 @@ RDEPEND=$DEPEND
 src_compile() {            
    cd ${S}               
     try ./configure --shared --prefix=/usr
-    try make
+    try make ${MAKEOPTS}
     try make test
     try ./configure --prefix=/usr
-    try make
+    try make ${MAKEOPTS}
 }
 
 src_install() {                               
@@ -28,9 +28,8 @@ src_install() {
     doins zconf.h zlib.h
     dolib libz.so.1.1.3
     dolib libz.a
-#    dosym libz.so.1.1.3 /usr/lib/libz.so
-#    dosym libz.so.1.1.3 /usr/lib/libz.so.1
-    preplib
+    dosym libz.so.1.1.3 /usr/lib/libz.so
+    dosym libz.so.1.1.3 /usr/lib/libz.so.1
     dodoc FAQ README algorithm.txt ChangeLog
 }