A=-fix, try->die, tab-fixes, stylefixes, ...

44 files changed, 277 insertions, 643 deletions

diff --git a/dev-libs/DirectFB/DirectFB-0.9.0.ebuild b/dev-libs/DirectFB/DirectFB-0.9.0.ebuild
deleted file mode 100644
index fa620d309550..000000000000
--- a/dev-libs/DirectFB/DirectFB-0.9.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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-libs/DirectFB/DirectFB-0.9.0.ebuild,v 1.4 2001/06/03 09:54:22 achim Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="DirectFB is a thin library on top of the Linux fb devices"
-SRC_URI="http://www.directfb.org/download/${A}"
-HOMEPAGE="http://www.directfb.org"
-
-DEPEND="virtual/glibc sys-devel/perl >=media-libs/freetype-2.0.1 >=media-libs/jpeg-6
-	>=media-libs/libpng-1.0.10"
-
-RDEPEND="virtual/glibc >=media-libs/freetype-2.0.1 >=media-libs/jpeg-6
-	>=media-libs/libpng-1.0.10"
-
-src_compile() {
-
-    try ./configure --prefix=/usr --host=${CHOST}
-    cp Makefile Makefile.orig
-    sed -e "s:examples::" Makefile.orig > Makefile
-    try make
-
-}
-
-src_install () {
-
-    try make DESTDIR=${D} install
-    dodoc AUTHORS COPYING ChangeLog NEWS README* TODO
-    docinto html
-    dodoc docs/html/*.{png,html}
-}
-
diff --git a/dev-libs/DirectFB/DirectFB-0.9.3.ebuild b/dev-libs/DirectFB/DirectFB-0.9.3.ebuild
index b06b121deeac..2fa415188d69 100644
--- a/dev-libs/DirectFB/DirectFB-0.9.3.ebuild
+++ b/dev-libs/DirectFB/DirectFB-0.9.3.ebuild
@@ -1,67 +1,74 @@
 # 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-libs/DirectFB/DirectFB-0.9.3.ebuild,v 1.2 2001/06/23 21:34:37 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/DirectFB-0.9.3.ebuild,v 1.3 2001/11/10 12:05:20 hallski Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="DirectFB is a thin library on top of the Linux fb devices"
-SRC_URI="http://www.directfb.org/download/DirectFB/${A}"
+SRC_URI="http://www.directfb.org/download/DirectFB/${P}.tar.gz"
 HOMEPAGE="http://www.directfb.org"
 
-DEPEND="virtual/glibc sys-devel/perl >=media-libs/freetype-2.0.1 >=media-libs/jpeg-6
-	>=media-libs/libpng-1.0.10 >=media-libs/libflash-0.4.10
+RDEPEND="virtual/glibc
+	>=media-libs/freetype-2.0.1
+	>=media-libs/jpeg-6
+	>=media-libs/libpng-1.0.10
+	>=media-libs/libflash-0.4.10
 	avifile? ( >=media-video/avifile-0.6.0 )
 	libmpeg3? ( >=media-libs/libmpeg3-1.2.3 )"
 
-RDEPEND="virtual/glibc >=media-libs/freetype-2.0.1 >=media-libs/jpeg-6
-	>=media-libs/libpng-1.0.10 >=media-libs/libflash-0.4.10
-	avifile? ( >=media-video/avifile-0.6.0 )
-	libmpeg3? ( >=media-libs/libmpeg3-1.2.3 )"
+DEPEND="${RDEPEND}
+	sys-devel/perl"
 
 src_compile() {
-    if [ "`use mmx`" ] ; then
-      myconf="--enable-mmx"
-    else
-      myconf="--disable-mmx"
-    fi
-    if [ "`use avifile`" ] ; then
-      myconf="$myconf --enable-avifile"
-    else
-      myconf="$myconf --disable-avifile"
-    fi
-    if [ "`use libmpeg3`" ] ; then
-      myconf="$myconf --with-libmpeg3=/usr/include/libmpeg3"
-      mkdir ${S}/interfaces/IDirectFBVideoProvider/no
-      cp /usr/lib/libmpeg3.a ${S}/interfaces/IDirectFBVideoProvider/no
-    else
-      myconf="$myconf --disable-libmpeg3"
-    fi
-    if [ "$DEBUG" ] ; then
-      myconf="$myconf --enable-debug"
-    else
-      myconf="$myconf --disable-debug"
-    fi
-    try ./configure --prefix=/usr --host=${CHOST} $myconf \
-	--enable-jpeg --enable-png --enable-gif 
-#    cp Makefile Makefile.orig
-#    sed -e "s:examples::" Makefile.orig > Makefile
-    if [ "`use libmpeg3`" ] ; then
-       try make LIBMPEG3_DIR=/usr/lib LIBMPEG3_LIBS=-lmpeg3
-    else
-    try make
-    fi
+	local myconf
+
+	if [ "`use mmx`" ] ; then
+		myconf="--enable-mmx"
+	else
+		myconf="--disable-mmx"
+	fi
+	if [ "`use avifile`" ] ; then
+		myconf="$myconf --enable-avifile"
+	else
+		myconf="$myconf --disable-avifile"
+	fi
+	if [ "`use libmpeg3`" ] ; then
+		myconf="$myconf --with-libmpeg3=/usr/include/libmpeg3"
+     		mkdir ${S}/interfaces/IDirectFBVideoProvider/no
+		cp /usr/lib/libmpeg3.a ${S}/interfaces/IDirectFBVideoProvider/no
+	else
+		myconf="$myconf --disable-libmpeg3"
+	fi
+	if [ "$DEBUG" ] ; then
+		myconf="$myconf --enable-debug"
+	else
+		myconf="$myconf --disable-debug"
+	
+	./configure --host=${CHOST}					\
+		    --prefix=/usr					\
+	  	    --enable-jpeg					\
+		    --enable-png					\
+		    --enable-gif 					\
+		    $myconf || die
 
+	if [ "`use libmpeg3`" ] ; then
+		make LIBMPEG3_DIR=/usr/lib LIBMPEG3_LIBS=-lmpeg3 || die
+	else
+		make || die
+	fi
 }
 
 src_install () {
-    if [ "`use libmpeg3`" ] ; then
-       try make LIBMPEG3_DIR=/usr/lib LIBMPEG3_LIBS=-lmpeg3 DESTDIR=${D} install
-    else
-    try make DESTDIR=${D} install
-    fi
-    dodoc AUTHORS COPYING ChangeLog NEWS README* TODO
-    docinto html
-    dodoc docs/html/*.{png,html}
-}
+	if [ "`use libmpeg3`" ] ; then
+       		make DESTDIR=${D}					\
+		     LIBMPEG3_DIR=/usr/lib 				\
+		     LIBMPEG3_LIBS=-lmpeg3				\
+		     install || die
+	else
+		make DESTDIR=${D} install || die
+    	fi
 
+	dodoc AUTHORS COPYING ChangeLog NEWS README* TODO
+	docinto html
+	dodoc docs/html/*.{png,html}
+}
diff --git a/dev-libs/DirectFB/files/digest-DirectFB-0.9.0 b/dev-libs/DirectFB/files/digest-DirectFB-0.9.0
deleted file mode 100644
index d07a6989111e..000000000000
--- a/dev-libs/DirectFB/files/digest-DirectFB-0.9.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e4f375955ae6b70a79cbf706af780c35 DirectFB-0.9.0.tar.gz 892928
diff --git a/dev-libs/expat/expat-1.95.1-r1.ebuild b/dev-libs/expat/expat-1.95.1-r1.ebuild
index 398fdcd68dc9..9e4edc3d9b3d 100644
--- a/dev-libs/expat/expat-1.95.1-r1.ebuild
+++ b/dev-libs/expat/expat-1.95.1-r1.ebuild
@@ -1,30 +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/dev-libs/expat/expat-1.95.1-r1.ebuild,v 1.1 2001/02/27 15:36:32 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/expat-1.95.1-r1.ebuild,v 1.2 2001/11/10 12:05:20 hallski Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="XML parsing libraries"
-SRC_URI="http://download.sourceforge.net/expat/${A}"
+SRC_URI="http://download.sourceforge.net/expat/${P}.tar.gz"
 HOMEPAGE="http://expat.sourceforge.net"
 
 DEPEND="virtual/glibc"
 
 src_compile() {      
-                     
-	try ./configure --prefix=/usr
-	try pmake
+	./configure --prefix=/usr || die
+
+	emake || die
 }
 
 src_install() {                               
+	make DESTDIR=${D} install || die
 
-    try make DESTDIR=${D} install
-    #try make prefix=${D}/usr install
 	dodoc COPYING Changes MANIFEST README 
-    docinto html
-    dodoc doc/*
+	docinto html
+	dodoc doc/*
 }
-
-
-
diff --git a/dev-libs/g-wrap/files/digest-g-wrap-0.9.5-r1 b/dev-libs/g-wrap/files/digest-g-wrap-0.9.5-r1
deleted file mode 100644
index 3c4526f971f4..000000000000
--- a/dev-libs/g-wrap/files/digest-g-wrap-0.9.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0df68c8b52d3ffdde0ea330be60c3bce g-wrap-0.9.5.tar.gz 221184
diff --git a/dev-libs/g-wrap/files/digest-g-wrap-1.1.9 b/dev-libs/g-wrap/files/digest-g-wrap-1.1.9
deleted file mode 100644
index ecd3fa066dc3..000000000000
--- a/dev-libs/g-wrap/files/digest-g-wrap-1.1.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b06927729dbc6c1322bf9d61e2662036 g-wrap-1.1.9.tar.gz 249856
diff --git a/dev-libs/g-wrap/g-wrap-0.9.5-r1.ebuild b/dev-libs/g-wrap/g-wrap-0.9.5-r1.ebuild
deleted file mode 100644
index f24e881f5567..000000000000
--- a/dev-libs/g-wrap/g-wrap-0.9.5-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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-libs/g-wrap/g-wrap-0.9.5-r1.ebuild,v 1.1 2001/05/06 16:36:11 achim Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="A tool for exporting C libraries into Scheme"
-SRC_URI="ftp://ftp.gnucash.org/pub/g-wrap/source/${A}"
-HOMEPAGE="http://"
-
-DEPEND=">=sys-libs/glibc-2.1.3
-	>=dev-util/guile-1.4"
-
-src_compile() {
-
-    try ./configure --prefix=/usr --libexecdir=/usr/lib/misc \
-	--infodir=/usr/share/info --host=${CHOST}
-    try make
-
-}
-
-src_install () {
-
-    cd ${S}
-    try make DESTDIR=${D} install
-
-}
-
diff --git a/dev-libs/g-wrap/g-wrap-1.1.11.ebuild b/dev-libs/g-wrap/g-wrap-1.1.11.ebuild
index d4f20a367cbb..81073733d888 100644
--- a/dev-libs/g-wrap/g-wrap-1.1.11.ebuild
+++ b/dev-libs/g-wrap/g-wrap-1.1.11.ebuild
@@ -1,12 +1,11 @@
 # 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-libs/g-wrap/g-wrap-1.1.11.ebuild,v 1.2 2001/07/31 10:51:46 hallski Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/g-wrap/g-wrap-1.1.11.ebuild,v 1.3 2001/11/10 12:05:20 hallski Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="A tool for exporting C libraries into Scheme"
-SRC_URI="ftp://ftp.gnucash.org/pub/g-wrap/source/${A}"
+SRC_URI="ftp://ftp.gnucash.org/pub/g-wrap/source/${P}.tar.gz"
 HOMEPAGE="http://"
 
 DEPEND=">=sys-libs/glibc-2.1.3
@@ -14,17 +13,15 @@ DEPEND=">=sys-libs/glibc-2.1.3
 	>=dev-libs/slib-2.4.1"
 
 src_compile() {
+	./configure --host=${CHOST}					\
+		    --prefix=/usr					\
+		    --libexecdir=/usr/lib/misc 				\
+		    --infodir=/usr/share/info 
+	assert
 
-    try ./configure --prefix=/usr --libexecdir=/usr/lib/misc \
-	--infodir=/usr/share/info --host=${CHOST}
-    try make
-
+	make || die
 }
 
 src_install () {
-
-    cd ${S}
-    try make DESTDIR=${D} install
-
+	make DESTDIR=${D} install || die
 }
-
diff --git a/dev-libs/g-wrap/g-wrap-1.1.9.ebuild b/dev-libs/g-wrap/g-wrap-1.1.9.ebuild
deleted file mode 100644
index 58e15d01781c..000000000000
--- a/dev-libs/g-wrap/g-wrap-1.1.9.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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-libs/g-wrap/g-wrap-1.1.9.ebuild,v 1.1 2001/07/13 11:37:26 achim Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="A tool for exporting C libraries into Scheme"
-SRC_URI="ftp://ftp.gnucash.org/pub/g-wrap/source/${A}"
-HOMEPAGE="http://"
-
-DEPEND=">=sys-libs/glibc-2.1.3
-	>=dev-util/guile-1.4"
-
-src_compile() {
-
-    try ./configure --prefix=/usr --libexecdir=/usr/lib/misc \
-	--infodir=/usr/share/info --host=${CHOST}
-    try make
-
-}
-
-src_install () {
-
-    cd ${S}
-    try make DESTDIR=${D} install
-
-}
-
diff --git a/dev-libs/glib/files/digest-glib-1.2.10 b/dev-libs/glib/files/digest-glib-1.2.10
deleted file mode 100644
index 83ab230b5ad6..000000000000
--- a/dev-libs/glib/files/digest-glib-1.2.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6fe30dad87c77b91b632def29dd69ef9 glib-1.2.10.tar.gz 421888
diff --git a/dev-libs/glib/glib-1.2.10.ebuild b/dev-libs/glib/glib-1.2.10.ebuild
deleted file mode 100644
index 5bd66d2b502a..000000000000
--- a/dev-libs/glib/glib-1.2.10.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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-libs/glib/glib-1.2.10.ebuild,v 1.2 2001/06/11 08:11:28 hallski Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="The GLib library of C routines"
-SRC_URI="ftp://ftp.gtk.org/pub/gtk/v1.2/${A}
-	 ftp://ftp.gnome.org/pub/GNOME/stable/sources/glib/${A}
-	 http://ftp.gnome.org/pub/GNOME/stable/sources/glib/${A}"
-HOMEPAGE="http://www.gtk.org/"
-
-DEPEND="virtual/glibc"
-
-src_compile() {
-    local myconf
-    
-    if [ "${DEBUG}" ]
-    then
-	myconf="--enable-debug=yes"
-    else
-	myconf="--enable-debug=no"
-    fi
-    
-    try ./configure --host=${CHOST} --prefix=/usr \
-	--infodir=/usr/share/info \
-	--mandir=/usr/share/man  \
-	--with-threads=posix ${myconf}
-    try pmake
-}
-
-src_install() {
-    try make install DESTDIR=${D}
-    
-    dodoc AUTHORS ChangeLog COPYING README* INSTALL NEWS
-    cd docs
-    docinto html
-    dodoc glib.html glib_toc.html
-}
-
-
-
-
-
diff --git a/dev-libs/gmp/gmp-3.1.1-r1.ebuild b/dev-libs/gmp/gmp-3.1.1-r1.ebuild
index a69b2167307f..5d3885212669 100644
--- a/dev-libs/gmp/gmp-3.1.1-r1.ebuild
+++ b/dev-libs/gmp/gmp-3.1.1-r1.ebuild
@@ -1,35 +1,34 @@
 # 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-libs/gmp/gmp-3.1.1-r1.ebuild,v 1.2 2001/05/29 17:28:19 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-3.1.1-r1.ebuild,v 1.3 2001/11/10 12:05:20 hallski Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Library for arithmetic on arbitrary precision integers, rational numbers, and floating-point numbers"
-SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/gmp/${A}
-	 ftp://prep.ai.mit.edu/gnu/gmp/${A}"
+SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/gmp/${P}.tar.gz
+	 ftp://prep.ai.mit.edu/gnu/gmp/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/gmp/gmp.html"
 DEPEND="virtual/glibc
 	>=sys-devel/m4-1.4o"
 RDEPEND="virtual/glibc"
 
 src_compile() {                           
-  try ./configure --prefix=/usr --infodir=/usr/share/info --host=${CHOST} \
-	--enable-mpfr --enable-mpbsd
-  try make
+	./configure --host=${CHOST}					\
+		    --prefix=/usr					\
+		    --infodir=/usr/share/info				\
+		    --enable-mpfr					\
+		    --enable-mpbsd
+	assert
+
+	make || die
 }
 
 src_install() {                               
+	make prefix=${D}/usr infodir=${D}/usr/share/info install || die
 
-  try make prefix=${D}/usr infodir=${D}/usr/share/info install
-
-  dodoc AUTHORS ChangeLog COPYING* NEWS README
-  dodoc doc/assembly_code doc/configuration
-  dodoc doc/isa_abi_headache doc/multiplication
-  docinto html
-  dodoc doc/*.html
-
+	dodoc AUTHORS ChangeLog COPYING* NEWS README
+	dodoc doc/assembly_code doc/configuration
+	dodoc doc/isa_abi_headache doc/multiplication
+	docinto html
+	dodoc doc/*.html
 }
-
-
-
diff --git a/dev-libs/libol/libol-0.2.23.ebuild b/dev-libs/libol/libol-0.2.23.ebuild
index db80b3ca1937..24f0562c1eef 100644
--- a/dev-libs/libol/libol-0.2.23.ebuild
+++ b/dev-libs/libol/libol-0.2.23.ebuild
@@ -1,30 +1,29 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Bruce Locke <blocke@shivan.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libol/libol-0.2.23.ebuild,v 1.4 2001/08/31 03:23:38 pm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libol/libol-0.2.23.ebuild,v 1.5 2001/11/10 12:05:20 hallski Exp $
 
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Support library for syslog-ng"
-SRC_URI="http://www.balabit.hu/downloads/libol/0.2/${A}"
+SRC_URI="http://www.balabit.hu/downloads/libol/0.2/${P}.tar.gz"
 HOMEPAGE="http://www.balabit.hu/en/products/syslog-ng/"
 
 #DEPEND=">="
 
 src_compile() {
-
-  try ./configure --host=${CHOST} --prefix=/usr --enable-shared --enable-static --disable-libtool-lock
-  try make CFLAGS="${CFLAGS}" ${MAKEOPTS} prefix=${D}/usr all
-
+	./configure --host=${CHOST}					\
+		    --prefix=/usr					\
+		    --enable-shared					\
+		    --enable-static					\
+		    --disable-libtool-lock
+	assert
+
+	make CFLAGS="${CFLAGS}" ${MAKEOPTS} prefix=${D}/usr all || die
 }
 
 src_install() {
+	make prefix=${D}/usr install || die
 
-  try make prefix=${D}/usr install 
-  dodoc ChangeLog 
-
+	dodoc ChangeLog 
 }
-
-
-
diff --git a/dev-libs/libole2/libole2-0.2.3-r1.ebuild b/dev-libs/libole2/libole2-0.2.3-r1.ebuild
index 241eadd0d62b..cdc7236952da 100644
--- a/dev-libs/libole2/libole2-0.2.3-r1.ebuild
+++ b/dev-libs/libole2/libole2-0.2.3-r1.ebuild
@@ -3,10 +3,9 @@
 # Author Achim Gottinger <achim@gentoo.org>
 # $Header
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="libole2"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/${PN}/${A}"
+SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.gnome.org/"
 
 DEPEND=">=dev-libs/glib-1.2.8"
diff --git a/dev-libs/libole2/libole2-0.2.4.ebuild b/dev-libs/libole2/libole2-0.2.4.ebuild
index 427a39a23c7d..de96401e42b7 100644
--- a/dev-libs/libole2/libole2-0.2.4.ebuild
+++ b/dev-libs/libole2/libole2-0.2.4.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-libs/libole2/libole2-0.2.4.ebuild,v 1.1 2001/11/05 20:41:07 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libole2/libole2-0.2.4.ebuild,v 1.2 2001/11/10 12:05:20 hallski Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="libole2"
@@ -10,7 +10,6 @@ HOMEPAGE="http://www.gnome.org/"
 
 DEPEND=">=dev-libs/glib-1.2.10-r1"
 
-
 src_compile() {
 
 	./configure --host=${CHOST} 					\
diff --git a/dev-libs/libpcre/libpcre-3.4-r1.ebuild b/dev-libs/libpcre/libpcre-3.4-r1.ebuild
index 31d4eab621ab..38a67dea2947 100644
--- a/dev-libs/libpcre/libpcre-3.4-r1.ebuild
+++ b/dev-libs/libpcre/libpcre-3.4-r1.ebuild
@@ -1,32 +1,28 @@
 # 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-libs/libpcre/libpcre-3.4-r1.ebuild,v 1.1 2001/03/06 06:20:41 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-3.4-r1.ebuild,v 1.2 2001/11/10 12:05:20 hallski Exp $
 
-A=pcre-${PV}.tar.gz
 S=${WORKDIR}/pcre-${PV}
 DESCRIPTION="Perl compatible regular expressions"
-SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/"${A}
+SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${PV}.tar.gz"
 
 DEPEND="virtual/glibc"
 
 src_compile() {                           
+	./configure --host=${CHOST}					\
+		    --prefix=/usr					\
+		    --mandir=/usr/share/man
+	assert
 
-  try ./configure --host=${CHOST} --prefix=/usr --mandir=/usr/share/man
-  try make
+	make || die
 }
 
 src_install() {                               
+	make DESTDIR=${D} install || die
 
-  try make DESTDIR=${D} install
-
-  dodoc AUTHORS COPYING ChangeLog LICENCE NEWS NON-UNIX-USE README
-  dodoc doc/*.txt doc/Tech.Notes
-  docinto html
-  dodoc doc/*.html
-  
+	dodoc AUTHORS COPYING ChangeLog LICENCE NEWS NON-UNIX-USE README
+	dodoc doc/*.txt doc/Tech.Notes
+	docinto html
+	dodoc doc/*.html
 }
-
-
-
-
diff --git a/dev-libs/librep/librep-0.13.6.ebuild b/dev-libs/librep/librep-0.13.6.ebuild
index 88bdefaca371..9135f338c539 100644
--- a/dev-libs/librep/librep-0.13.6.ebuild
+++ b/dev-libs/librep/librep-0.13.6.ebuild
@@ -1,13 +1,12 @@
 # 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-libs/librep/librep-0.13.6.ebuild,v 1.6 2001/08/31 03:23:38 pm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/librep/librep-0.13.6.ebuild,v 1.7 2001/11/10 12:05:20 hallski Exp $
 
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Shared library implementing a Lisp dialect"
-SRC_URI="http://prdownloads.sourceforge.net/librep/${A}"
+SRC_URI="http://prdownloads.sourceforge.net/librep/${P}.tar.gz"
 HOMEPAGE="http://librep.sourceforge.net/"
 
 DEPEND="virtual/glibc
diff --git a/dev-libs/librep/librep-0.14.ebuild b/dev-libs/librep/librep-0.14.ebuild
index 90804820ddcc..1a651786f0d2 100644
--- a/dev-libs/librep/librep-0.14.ebuild
+++ b/dev-libs/librep/librep-0.14.ebuild
@@ -1,46 +1,45 @@
 # 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-libs/librep/librep-0.14.ebuild,v 1.2 2001/07/30 06:53:54 blocke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/librep/librep-0.14.ebuild,v 1.3 2001/11/10 12:05:20 hallski Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Shared library implementing a Lisp dialect"
-SRC_URI="http://prdownloads.sourceforge.net/librep/${A}"
+SRC_URI="http://prdownloads.sourceforge.net/librep/${P}.tar.gz"
 HOMEPAGE="http://librep.sourceforge.net/"
 
 DEPEND="virtual/glibc
 	>=sys-libs/gdbm-1.8.0
 	>=dev-libs/gmp-3.1.1
-        readline? ( >=sys-libs/readline-4.1 >=sys-libs/ncurses-5.2 )
+        readline? ( >=sys-libs/readline-4.1
+		    >=sys-libs/ncurses-5.2 )
         sys-apps/texinfo"
 
 src_compile() {
-
-  local myconf
-
-  if [ "`use readline`" ]
-  then
-    myconf="--with-readline"
-  else
-    myconf="--without-readline"
-  fi
-
-  try ./configure --host=${CHOST} --prefix=/usr --libexecdir=/usr/lib \
-        --infodir=/usr/share/info
-  try make
+	local myconf
+
+	if [ "`use readline`" ]
+	then
+		myconf="--with-readline"
+	else
+		myconf="--without-readline"
+	fi
+
+	./configure --host=${CHOST}					\
+		    --prefix=/usr					\
+		    --libexecdir=/usr/lib 				\
+		    --infodir=/usr/share/info
+	assert
+
+	make || die
 }
 
 src_install() {
-  try make DESTDIR=${D} install
-	#	prefix=${D}/usr aclocaldir=/${D}/usr/share/aclocal \
-	#   libexecdir=${D}/usr/lib infodir=${D}/usr/share/info \
-	#   datadir=${D}/usr/share install
-
-  insinto /usr/include
-  doins src/rep_config.h
-  dodoc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO DOC
-  docinto doc
-  dodoc doc/*
-}
+	make DESTDIR=${D} install || die
 
+	insinto /usr/include
+	doins src/rep_config.h
+	dodoc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO DOC
+	docinto doc
+	dodoc doc/*
+}
diff --git a/dev-libs/libsigc++/libsigc++-1.0.3.ebuild b/dev-libs/libsigc++/libsigc++-1.0.3.ebuild
index 380b6aef114b..832bfd1ae28b 100644
--- a/dev-libs/libsigc++/libsigc++-1.0.3.ebuild
+++ b/dev-libs/libsigc++/libsigc++-1.0.3.ebuild
@@ -1,12 +1,11 @@
 # 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-libs/libsigc++/libsigc++-1.0.3.ebuild,v 1.1 2001/06/14 14:41:32 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/libsigc++-1.0.3.ebuild,v 1.2 2001/11/10 12:05:20 hallski Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="The GLib library of C routines"
-SRC_URI="http://prdownloads.sourceforge.net/libsigc/${A}"
+SRC_URI="http://prdownloads.sourceforge.net/libsigc/${P}.tar.gz"
 HOMEPAGE="http://libsigc.sourceforge.net/"
 
 DEPEND="virtual/glibc"
diff --git a/dev-libs/libsigc++/libsigc++-1.0.4.ebuild b/dev-libs/libsigc++/libsigc++-1.0.4.ebuild
index 1fdcccc93c13..38dad2054381 100644
--- a/dev-libs/libsigc++/libsigc++-1.0.4.ebuild
+++ b/dev-libs/libsigc++/libsigc++-1.0.4.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-libs/libsigc++/libsigc++-1.0.4.ebuild,v 1.1 2001/11/05 21:25:04 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/libsigc++-1.0.4.ebuild,v 1.2 2001/11/10 12:05:20 hallski Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="The GLib library of C routines"
@@ -10,7 +10,6 @@ HOMEPAGE="http://libsigc.sourceforge.net/"
 
 DEPEND="virtual/glibc"
 
-
 src_compile() {
 
 	local myconf
@@ -22,24 +21,18 @@ src_compile() {
 		myconf="--enable-debug=no"
 	fi
     
-	./configure --host=${CHOST}		\
-		--prefix=/usr			\
-		--infodir=/usr/share/info	\
-		--mandir=/usr/share/man		\
-		${myconf} || die
+	./configure --host=${CHOST}					\
+		    --prefix=/usr					\
+	  	    --infodir=/usr/share/info				\
+		    --mandir=/usr/share/man				\
+		    ${myconf} || die
 	
 	emake || die
 }
 
 src_install() {
-
-	make DESTDIR=${D}			\
-		install || die
+	make DESTDIR=${D}						\
+	     install || die
     
 	dodoc AUTHORS ChangeLog COPYING README* INSTALL NEWS
 }
-
-
-
-
-
diff --git a/dev-libs/libunicode/libunicode-0.4-r1.ebuild b/dev-libs/libunicode/libunicode-0.4-r1.ebuild
index 1d4cf0439527..42d8ce04a90b 100644
--- a/dev-libs/libunicode/libunicode-0.4-r1.ebuild
+++ b/dev-libs/libunicode/libunicode-0.4-r1.ebuild
@@ -1,13 +1,11 @@
 # 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
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libunicode/libunicode-0.4-r1.ebuild,v 1.7 2001/11/10 12:05:20 hallski Exp $
 
-A=${P}.gnome.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Unicode library"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/${PN}/${A}"
-
+SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/${PN}/${P}.gnome.tar.gz"
 HOMEPAGE="http://www.gnome.org/"
 
 DEPEND="virtual/glibc"
diff --git a/dev-libs/libusb/libusb-0.1.3b.ebuild b/dev-libs/libusb/libusb-0.1.3b.ebuild
index b2676158ff35..cea61e0f7249 100644
--- a/dev-libs/libusb/libusb-0.1.3b.ebuild
+++ b/dev-libs/libusb/libusb-0.1.3b.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 Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/libusb-0.1.3b.ebuild,v 1.1 2001/06/05 19:43:20 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/libusb-0.1.3b.ebuild,v 1.2 2001/11/10 12:05:20 hallski Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Userspace access to USB devices"
-SRC_URI="http://prdownloads.sourceforge.net/libusb/${A}"
+SRC_URI="http://prdownloads.sourceforge.net/libusb/${P}.tar.gz"
 HOMEPAGE="http://libusb.sourceforge.net"
 
 DEPEND="virtual/glibc"
 
 src_compile() {
+	./configure --host=${CHOST}					\
+		    --prefix=/usr
+	assert
 
-    try ./configure --prefix=/usr --host=${CHOST}
-    try make
-
+	make || die
 }
 
 src_install () {
+	make DESTDIR=${D} install || die
 
-    try make DESTDIR=${D} install
-    dodoc AUTHORS NEWS README
+	dodoc AUTHORS NEWS README
 }
-
diff --git a/dev-libs/libxml/files/digest-libxml-1.8.15 b/dev-libs/libxml/files/digest-libxml-1.8.15
deleted file mode 100644
index efea1a8c1f42..000000000000
--- a/dev-libs/libxml/files/digest-libxml-1.8.15
+++ /dev/null
@@ -1 +0,0 @@
-MD5 65894b7a67fc8f2aaa9454ab423b6887 libxml-1.8.15.tar.gz 1024000
diff --git a/dev-libs/libxml/libxml-1.8.15.ebuild b/dev-libs/libxml/libxml-1.8.15.ebuild
deleted file mode 100644
index 2fb9884e57b1..000000000000
--- a/dev-libs/libxml/libxml-1.8.15.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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-libs/libxml/libxml-1.8.15.ebuild,v 1.3 2001/10/06 10:06:49 hallski Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="libxml"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A}"
-HOMEPAGE="http://www.gnome.org/"
-
-RDEPEND=">=sys-libs/ncurses-5.2"
-
-DEPEND="${RDEPEND}
-        >=sys-libs/readline-4.1"
-
-
-src_compile() {
-	LDFLAGS="-lncurses" ./configure --host=${CHOST} 		\
-	                                --prefix=/usr	 		\
-				        --sysconfdir=/etc || die
-
-	make || die # Doesn't work with -j 4 (hallski)
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING* ChangeLog NEWS README
-}
-
-
-
-
-
-
-
diff --git a/dev-libs/libxml2/files/digest-libxml2-2.3.11 b/dev-libs/libxml2/files/digest-libxml2-2.3.11
deleted file mode 100644
index 503c46f3ec8f..000000000000
--- a/dev-libs/libxml2/files/digest-libxml2-2.3.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7310ee1a8a3ba18b09c3756b4c0d8583 libxml2-2.3.11.tar.gz 1335296
diff --git a/dev-libs/libxml2/files/digest-libxml2-2.3.14 b/dev-libs/libxml2/files/digest-libxml2-2.3.14
deleted file mode 100644
index 95adad69c984..000000000000
--- a/dev-libs/libxml2/files/digest-libxml2-2.3.14
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5205bafbf0e5021c62ad15e1202bcfd4 libxml2-2.3.14.tar.gz 1343488
diff --git a/dev-libs/libxml2/files/digest-libxml2-2.3.9 b/dev-libs/libxml2/files/digest-libxml2-2.3.9
deleted file mode 100644
index cf7a526950c0..000000000000
--- a/dev-libs/libxml2/files/digest-libxml2-2.3.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e436e69347c52f7a398edbd504440ac4 libxml2-2.3.9.tar.gz 1318912
diff --git a/dev-libs/libxml2/files/digest-libxml2-2.4.0 b/dev-libs/libxml2/files/digest-libxml2-2.4.0
deleted file mode 100644
index dbf0d1da22ef..000000000000
--- a/dev-libs/libxml2/files/digest-libxml2-2.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 38634715dd81ceb2a69bac3da8b5e56c libxml2-2.4.0.tar.gz 1347584
diff --git a/dev-libs/libxml2/libxml2-2.3.11.ebuild b/dev-libs/libxml2/libxml2-2.3.11.ebuild
deleted file mode 100644
index abc31d777726..000000000000
--- a/dev-libs/libxml2/libxml2-2.3.11.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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-libs/libxml2/libxml2-2.3.11.ebuild,v 1.3 2001/08/31 23:32:48 hallski Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="libxml"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/libxml/${A}"
-HOMEPAGE="http://www.gnome.org/"
-
-DEPEND="virtual/glibc
-        >=sys-libs/ncurses-5.2
-        >=sys-libs/readline-4.1
-	>=sys-libs/zlib-1.1.3" 
-
-src_compile() {
-	./configure --host=${CHOST} 					\
-		    --prefix=/usr					\
-		    --sysconfdir=/etc					\
-		    --with-zlib || die
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING* ChangeLog NEWS README
-}
diff --git a/dev-libs/libxml2/libxml2-2.3.14.ebuild b/dev-libs/libxml2/libxml2-2.3.14.ebuild
deleted file mode 100644
index dec4f070120e..000000000000
--- a/dev-libs/libxml2/libxml2-2.3.14.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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-libs/libxml2/libxml2-2.3.14.ebuild,v 1.2 2001/08/31 23:32:48 hallski Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="libxml"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/libxml/${A}"
-HOMEPAGE="http://www.gnome.org/"
-
-DEPEND="virtual/glibc
-        >=sys-libs/ncurses-5.2
-        >=sys-libs/readline-4.1
-	>=sys-libs/zlib-1.1.3" 
-
-src_compile() {
-	./configure --host=${CHOST} 					\
-		    --prefix=/usr					\
-		    --sysconfdir=/etc					\
-		    --with-zlib || die
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING* ChangeLog NEWS README
-}
diff --git a/dev-libs/libxml2/libxml2-2.3.9.ebuild b/dev-libs/libxml2/libxml2-2.3.9.ebuild
deleted file mode 100644
index 31c21fea71a8..000000000000
--- a/dev-libs/libxml2/libxml2-2.3.9.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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-libs/libxml2/libxml2-2.3.9.ebuild,v 1.4 2001/08/31 23:32:48 hallski Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="libxml"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/libxml/${A}"
-HOMEPAGE="http://www.gnome.org/"
-
-DEPEND="virtual/glibc
-        >=sys-libs/ncurses-5.2
-        >=sys-libs/readline-4.1
-	>=sys-libs/zlib-1.1.3" 
-
-src_compile() {
-	./configure --host=${CHOST} 					\
-		    --prefix=/usr					\
-		    --sysconfdir=/etc					\
-		    --with-zlib  || die
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install
-
-	dodoc AUTHORS COPYING* ChangeLog NEWS README
-}
diff --git a/dev-libs/libxml2/libxml2-2.4.0.ebuild b/dev-libs/libxml2/libxml2-2.4.0.ebuild
deleted file mode 100644
index 1e55ff53087d..000000000000
--- a/dev-libs/libxml2/libxml2-2.4.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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-libs/libxml2/libxml2-2.4.0.ebuild,v 1.3 2001/08/31 23:32:48 hallski Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="libxml"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/libxml/${A}"
-HOMEPAGE="http://www.gnome.org/"
-
-DEPEND="virtual/glibc
-        >=sys-libs/ncurses-5.2
-        >=sys-libs/readline-4.1
-	>=sys-libs/zlib-1.1.3" 
-
-src_compile() {
-	./configure --host=${CHOST} 					\
-		    --prefix=/usr 					\
-		    --sysconfdir=/etc 					\
-		    --with-zlib  || die
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install
-
-	dodoc AUTHORS COPYING* ChangeLog NEWS README
-}
diff --git a/dev-libs/libxml2/libxml2-2.4.1.ebuild b/dev-libs/libxml2/libxml2-2.4.1.ebuild
index 481c2902af53..4c8e0f154806 100644
--- a/dev-libs/libxml2/libxml2-2.4.1.ebuild
+++ b/dev-libs/libxml2/libxml2-2.4.1.ebuild
@@ -1,12 +1,11 @@
 # 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-libs/libxml2/libxml2-2.4.1.ebuild,v 1.3 2001/08/31 23:32:48 hallski Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.4.1.ebuild,v 1.4 2001/11/10 12:05:20 hallski Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="libxml"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/libxml/${A}"
+SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/libxml/${P}.tar.gz"
 HOMEPAGE="http://www.gnome.org/"
 
 DEPEND="virtual/glibc
diff --git a/dev-libs/libxml2/libxml2-2.4.9.ebuild b/dev-libs/libxml2/libxml2-2.4.9.ebuild
index a79743202c1a..cbc0acab8be3 100644
--- a/dev-libs/libxml2/libxml2-2.4.9.ebuild
+++ b/dev-libs/libxml2/libxml2-2.4.9.ebuild
@@ -1,12 +1,11 @@
 # 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-libs/libxml2/libxml2-2.4.9.ebuild,v 1.1 2001/11/09 15:17:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.4.9.ebuild,v 1.2 2001/11/10 12:05:20 hallski Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="libxml"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/libxml/${A}"
+SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/libxml/${P}.tar.gz"
 HOMEPAGE="http://www.gnome.org/"
 
 DEPEND="virtual/glibc
diff --git a/dev-libs/libxslt/libxslt-1.0.1.ebuild b/dev-libs/libxslt/libxslt-1.0.1.ebuild
index d370c6e74728..674089e8d572 100644
--- a/dev-libs/libxslt/libxslt-1.0.1.ebuild
+++ b/dev-libs/libxslt/libxslt-1.0.1.ebuild
@@ -1,12 +1,11 @@
 # 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-libs/libxslt/libxslt-1.0.1.ebuild,v 1.4 2001/10/07 00:13:53 hallski Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/libxslt-1.0.1.ebuild,v 1.5 2001/11/10 12:05:20 hallski Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="libxslt"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A}"
+SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.gnome.org/"
 
 RDEPEND="virtual/glibc
diff --git a/dev-libs/openssl/openssl-0.9.6b.ebuild b/dev-libs/openssl/openssl-0.9.6b.ebuild
index b4fb45560c27..f2d862f584e9 100644
--- a/dev-libs/openssl/openssl-0.9.6b.ebuild
+++ b/dev-libs/openssl/openssl-0.9.6b.ebuild
@@ -1,47 +1,50 @@
 # 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-libs/openssl/openssl-0.9.6b.ebuild,v 1.6 2001/08/31 03:23:38 pm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.6b.ebuild,v 1.7 2001/11/10 12:05:20 hallski Exp $
 
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Toolkit for SSL v2/v3 and TLS v1"
-SRC_URI="http://www.openssl.org/source/${A}"
+SRC_URI="http://www.openssl.org/source/${P}.tar.gz"
 HOMEPAGE="http://www.opensl.org/"
 
-DEPEND="virtual/glibc >=sys-devel/perl-5"
+RDEPEND="virtual/glibc"
 
+DEPEND="${RDEPEND}
+	>=sys-devel/perl-5"
 
-RDEPEND="virtual/glibc "
 src_unpack() {
-
-  unpack ${A}
-  cd ${S}
-  try patch -p0 < ${FILESDIR}/${P}-Makefile.org-gentoo.diff
-  cp Configure Configure.orig
-  sed -e "s/-O3/$CFLAGS/" -e "s/-m486//" \
-    Configure.orig > Configure
-# Makefile borkage. The MANDIR is set to ${OPENSSLDIR}/man which is lame
-	sed -e 's:MANDIR=$(OPENSSLDIR)/man:MANDIR=/usr/share/man:g' Makefile | cat > Makefile
+	unpack ${A}
+	cd ${S}
+	try patch -p0 < ${FILESDIR}/${P}-Makefile.org-gentoo.diff
+	cp Configure Configure.orig
+	sed -e "s/-O3/$CFLAGS/" -e "s/-m486//" 				\
+    	    Configure.orig > Configure
+
+	# Makefile borkage. The MANDIR is set to ${OPENSSLDIR}/man 
+	# which is lame
+	sed -e 's:MANDIR=$(OPENSSLDIR)/man:MANDIR=/usr/share/man:g' 	\
+	    Makefile | cat > Makefile
 }
-
 src_compile() {
+	./config --prefix=/usr						\
+		 --openssldir=/usr/ssl					\
+		 shared threads || die
 
-   ./config --prefix=/usr --openssldir=/usr/ssl shared threads
-   try make all
+	make all || die
 }
 
 src_install() {
-    dodir /usr/ssl
-    try make INSTALL_PREFIX=${D} install
-
-    dodoc CHANGES* FAQ LICENSE NEWS README
-    dodoc doc/*.txt
-    docinto html
-    dodoc doc/*.gif doc/*.html
-    insinto /usr/share/emacs/site-lisp
-    doins doc/c-indentation.el
+	dodir /usr/ssl
+	make INSTALL_PREFIX=${D} install || die
+
+	dodoc CHANGES* FAQ LICENSE NEWS README
+	dodoc doc/*.txt
+	docinto html
+	dodoc doc/*.gif doc/*.html
+	insinto /usr/share/emacs/site-lisp
+	doins doc/c-indentation.el
 }
 
 
diff --git a/dev-libs/pilot-link/files/digest-pilot-link-0.9.0 b/dev-libs/pilot-link/files/digest-pilot-link-0.9.0
deleted file mode 100644
index 6489de82d704..000000000000
--- a/dev-libs/pilot-link/files/digest-pilot-link-0.9.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 558ed399ca19c5759eeb22ff0e23fdd2 pilot-link.0.9.0.tar.gz 458752
diff --git a/dev-libs/pilot-link/files/digest-pilot-link-0.9.5 b/dev-libs/pilot-link/files/digest-pilot-link-0.9.5
deleted file mode 100644
index 23ad5be41f3e..000000000000
--- a/dev-libs/pilot-link/files/digest-pilot-link-0.9.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2a593ec62adb57262d9b6a1cbf9908ee pilot-link.0.9.5.tar.gz 487424
diff --git a/dev-libs/pilot-link/pilot-link-0.9.0.ebuild b/dev-libs/pilot-link/pilot-link-0.9.0.ebuild
deleted file mode 100644
index 341b1eb209ac..000000000000
--- a/dev-libs/pilot-link/pilot-link-0.9.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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-libs/pilot-link/pilot-link-0.9.0.ebuild,v 1.2 2001/06/08 01:08:06 achim Exp $
-
-A=${PN}.${PV}.tar.gz
-S=${WORKDIR}/${PN}.${PV}
-DESCRIPTION="A pilot link librarie"
-SRC_URI="http://www.slac.com/pilone/kpilot_home/download/${A}"
-HOMEPAGE="http://www.slac.com/pilone/kpilot_home"
-
-DEPEND="virtual/glibc"
-src_unpack() {
-    unpack ${A}
-    patch -p0 <${FILESDIR}/${PF}-gentoo.diff
-}
-src_compile() {
-    try ./configure --prefix=/usr --mandir=/usr/share/man --host=${CHOST} \
-	--with-tcl=no --with-itcl=no --with-tk=no \
-	--with-python=no --with-java=no --with-perl5=no
-    try make
-
-}
-
-src_install () {
-
-    try make prefix=${D}/usr mandir1=${D}/usr/share/man/man1 mandir7=${D}/usr/share/man/man7  install
-    dodoc COPYING* ChangeLog README TODO 
-
-}
-
diff --git a/dev-libs/pilot-link/pilot-link-0.9.5.ebuild b/dev-libs/pilot-link/pilot-link-0.9.5.ebuild
deleted file mode 100644
index 54d92e3e8c35..000000000000
--- a/dev-libs/pilot-link/pilot-link-0.9.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# AJ Lewis <aj@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pilot-link/pilot-link-0.9.5.ebuild,v 1.1 2001/07/02 21:05:35 lamer Exp $
-
-A=${PN}.0.9.5.tar.gz
-S=${WORKDIR}/${PN}.0.9.5
-DESCRIPTION="A suite of tools contains a series of conduits for moving
-information to and from your Palm device and your desktop or workstation
-system."
-
-SRC_URI="http://www.gnu-designs.com/pilot-link/source/${A}"
-HOMEPAGE="http://www.gnu-designs.com/pilot-link/"
-DEPEND="virtual/glibc"
-
-src_compile() {
-   try ./configure --prefix=/usr/ --mandir=/usr/share/man \
-       --infodir=/usr/share/info  --with-tcl=no --with-itcl=no \
-		--with-tk=no --with-python=no --with-java=no --with-perl5=no
-	try make clean
-   try make ${MAKEOPTS}
-}
-
-src_install() {
-   try make prefix=${D}/usr/ mandir=${D}/usr/share/man infodir=${D}/usr/share/info install
-   dodoc COPYING COPYING.LIB ChangeLog README TODO doc/syncabs.sgml
-}
-
diff --git a/dev-libs/pilot-link/pilot-link-0.9.6.ebuild b/dev-libs/pilot-link/pilot-link-0.9.6.ebuild
index b35470a97874..635bee891a50 100644
--- a/dev-libs/pilot-link/pilot-link-0.9.6.ebuild
+++ b/dev-libs/pilot-link/pilot-link-0.9.6.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # AJ Lewis <aj@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pilot-link/pilot-link-0.9.6.ebuild,v 1.1 2001/10/08 09:09:10 hallski Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pilot-link/pilot-link-0.9.6.ebuild,v 1.2 2001/11/10 12:05:20 hallski Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A suite of tools contains a series of conduits for moving
@@ -14,15 +14,26 @@ HOMEPAGE="http://www.gnu-designs.com/pilot-link/"
 DEPEND="virtual/glibc"
 
 src_compile() {
-   try ./configure --prefix=/usr/ --mandir=/usr/share/man \
-       --infodir=/usr/share/info  --with-tcl=no --with-itcl=no \
-		--with-tk=no --with-python=no --with-java=no --with-perl5=no
-	try make clean
-   try make ${MAKEOPTS}
+	./configure --host=${CHOST}					\
+		    --prefix=/usr/					\
+		    --mandir=/usr/share/man 				\
+		    --infodir=/usr/share/info				\
+		    --with-tcl=no					\
+		    --with-itcl=no 					\
+		    --with-tk=no					\
+		    --with-python=no					\
+		    --with-java=no					\
+		    --with-perl5=no
+	assert
+
+	emake || die
 }
 
 src_install() {
-   try make prefix=${D}/usr/ mandir=${D}/usr/share/man infodir=${D}/usr/share/info install
-   dodoc COPYING COPYING.LIB ChangeLog README TODO doc/syncabs.sgml
-}
+	make prefix=${D}/usr						\
+	     mandir=${D}/usr/share/man					\
+	     infodir=${D}/usr/share/info				\
+	     install || die
 
+	dodoc COPYING COPYING.LIB ChangeLog README TODO doc/syncabs.sgml
+}
diff --git a/dev-libs/popt/popt-1.5.ebuild b/dev-libs/popt/popt-1.5.ebuild
index a30b1c659750..7604054b4d6a 100644
--- a/dev-libs/popt/popt-1.5.ebuild
+++ b/dev-libs/popt/popt-1.5.ebuild
@@ -1,30 +1,32 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Ben Lutgens <lamer@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/popt-1.5.ebuild,v 1.3 2001/06/23 21:34:37 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/popt-1.5.ebuild,v 1.4 2001/11/10 12:05:20 hallski Exp $
 
-#P=
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="libpopt needed for lots of gnome stuff"
-SRC_URI="ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/${A}"
+SRC_URI="ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/${P}.tar.gz"
 HOMEPAGE="http://www.rpm.org"
 
-DEPEND="virtual/glibc nls? ( sys-devel/gettext )"
+DEPEND="virtual/glibc
+	nls? ( sys-devel/gettext )"
 
 src_compile() {
-    local myconf
-    if [ -z "`use nls`" ] ; then
-      myconf="--disable-nls"
-    fi
-    try ./configure --prefix=/usr --mandir=/usr/share/man --host=${CHOST} $myconf
-    try make
+	local myconf
 
-}
+	if [ -z "`use nls`" ] ; then
+		myconf="--disable-nls"
+	fi
 
-src_install () {
+	./configure --host=${CHOST}					\
+		    --prefix=/usr					\
+		    --mandir=/usr/share/man				\
+		    $myconf || die
 
-    try make DESTDIR=${D} install
-	 dodoc CHANGES COPYING README
+	make || die
 }
 
+src_install () {
+	make DESTDIR=${D} install || die
+	dodoc CHANGES COPYING README
+}
diff --git a/dev-libs/rep-gtk/rep-gtk-0.15-r2.ebuild b/dev-libs/rep-gtk/rep-gtk-0.15-r2.ebuild
index 961547fd73fa..26350f5b826f 100644
--- a/dev-libs/rep-gtk/rep-gtk-0.15-r2.ebuild
+++ b/dev-libs/rep-gtk/rep-gtk-0.15-r2.ebuild
@@ -1,12 +1,11 @@
 # 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-libs/rep-gtk/rep-gtk-0.15-r2.ebuild,v 1.1 2001/10/06 12:36:36 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/rep-gtk/rep-gtk-0.15-r2.ebuild,v 1.2 2001/11/10 12:05:20 hallski Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="GTK/GDK bindings for the librep Lisp environment"
-SRC_URI="http://prdownloads.sourceforge.net/rep-gtk/"${A}
+SRC_URI="http://prdownloads.sourceforge.net/rep-gtk/${P}.tar.gz"
 HOMEPAGE="http://rep-gtk.sourceforge.net/"
 
 DEPEND=">=x11-libs/gtk+-1.2.10-r4
@@ -19,19 +18,29 @@ RDEPEND=">=x11-libs/gtk+-1.2.10-r4
 		 >=media-libs/gdk-pixbuf-0.11.0-r1 )"
 
 src_compile() {
-  if [ -n "`use gnome`" ]
-  then
-      try ./configure --host=${CHOST} --with-gnome --with-libglade
-  else
-      try ./configure --host=${CHOST} --without-gnome --without-libglade \
-	--without-gdk-pixbuf --without-gnome-canvas-pixbuf
-  fi
-  try make
+	local myconf
+
+	if [ -n "`use gnome`" ]
+	then
+		myconf="--with-gnome --with-libglade"
+	else
+		myconf="--without-gnome 				\
+			--without-libglade				\
+			--without-gdk-pixbuf 				\
+			--without-gnome-canvas-pixbuf"
+	fi
+
+	./configure --host=${CHOST} 					\
+		    --prefix=/usr					\
+		    $myconf || die
+
+	make || die
 }
 
 src_install() {                               
-  try make DESTDIR=${D} install
-  dodoc AUTHORS BUGS COPYING ChangeLog README* TODO
-  docinto examples
-  dodoc examples/*
+	make DESTDIR=${D} install || die
+
+	dodoc AUTHORS BUGS COPYING ChangeLog README* TODO
+	docinto examples
+	dodoc examples/*
 }
diff --git a/dev-libs/slib/slib-2.4.1.ebuild b/dev-libs/slib/slib-2.4.1.ebuild
index 3adf5a969078..934e007d2539 100644
--- a/dev-libs/slib/slib-2.4.1.ebuild
+++ b/dev-libs/slib/slib-2.4.1.ebuild
@@ -1,33 +1,31 @@
 # 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-libs/slib/slib-2.4.1.ebuild,v 1.3 2001/07/27 20:44:17 hallski Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/slib/slib-2.4.1.ebuild,v 1.4 2001/11/10 12:05:20 hallski Exp $
 
 P=slib2d1
-A=${P}.zip
 S=${WORKDIR}/slib
 DESCRIPTION=""
-SRC_URI="http://swissnet.ai.mit.edu/ftpdir/scm/${A}"
+SRC_URI="http://swissnet.ai.mit.edu/ftpdir/scm/${P}.tar.gz"
 HOMEPAGE="http://swissnet.ai.mit.edu/~jaffer/SLIB.html"
 
-DEPEND=">=app-arch/unzip-5.21
-	>=dev-util/guile-1.4"
-#	>=dev-libs/g-wrap-0.9.5"
 RDEPEND=">=dev-util/guile-1.4"
-#	>=dev-libs/g-wrap-0.9.5"
-src_install () {
 
-    insinto /usr/share/guile/site/slib
-    doins *.scm
-    dodoc ANNOUNCE ChangeLog FAQ README
-    doinfo slib.info
+DEPEND="${RDEPEND}
+	>=app-arch/unzip-5.21
+	>=dev-util/guile-1.4"
+
+src_install () {
+	insinto /usr/share/guile/site/slib
+	doins *.scm
+	dodoc ANNOUNCE ChangeLog FAQ README
+	doinfo slib.info
 }
 
 pkg_postinst () {
-    if [ "${ROOT}" == "/" ]
-    then
-        echo "Installing..."
-       guile -c "(use-modules (ice-9 slib)) (require 'new-catalog)" "/" 
-    fi
+	if [ "${ROOT}" == "/" ]
+	then
+	echo "Installing..."
+		guile -c "(use-modules (ice-9 slib)) (require 'new-catalog)" "/" 
+	fi
 }
-