add inherit eutils

22 files changed, 148 insertions, 126 deletions

diff --git a/dev-libs/beecrypt/beecrypt-3.1.0-r1.ebuild b/dev-libs/beecrypt/beecrypt-3.1.0-r1.ebuild
index 7c3b1c9cd1ef..4d5bf7629e6c 100644
--- a/dev-libs/beecrypt/beecrypt-3.1.0-r1.ebuild
+++ b/dev-libs/beecrypt/beecrypt-3.1.0-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-3.1.0-r1.ebuild,v 1.12 2004/04/16 02:33:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-3.1.0-r1.ebuild,v 1.13 2004/04/21 16:37:55 vapier Exp $
 
-inherit flag-o-matic
+inherit flag-o-matic eutils
 
 DESCRIPTION="Beecrypt is a general-purpose cryptography library."
 HOMEPAGE="http://sourceforge.net/projects/beecrypt"
@@ -45,5 +45,5 @@ src_install() {
 	make DESTDIR=${D} install || die "make install failed"
 	# Not needed
 	rm -f ${D}/usr/lib/python*/site-packages/_bc.*a
-	dodoc BUGS README BENCHMARKS NEWS || die "dodoc failed"
+	dodoc BUGS README BENCHMARKS NEWS
 }
diff --git a/dev-libs/gmp/gmp-4.1-r1.ebuild b/dev-libs/gmp/gmp-4.1-r1.ebuild
index 9ee6082a7504..9e0cf5002576 100644
--- a/dev-libs/gmp/gmp-4.1-r1.ebuild
+++ b/dev-libs/gmp/gmp-4.1-r1.ebuild
@@ -1,14 +1,17 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-4.1-r1.ebuild,v 1.18 2004/02/24 17:55:12 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-4.1-r1.ebuild,v 1.19 2004/04/21 16:38:20 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="Library for arithmetic on arbitrary precision integers, rational numbers, and floating-point numbers"
 HOMEPAGE="http://www.gnu.org/software/gmp/gmp.html"
 SRC_URI="ftp://prep.ai.mit.edu/gnu/gmp/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="LGPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc sparc alpha"
+IUSE=""
 
 DEPEND="~sys-devel/m4-1.4"
 
@@ -35,7 +38,7 @@ src_compile() {
 src_install() {
 	make DESTDIR=${D} install || die
 
-	dodoc AUTHORS ChangeLog COPYING* NEWS README
+	dodoc AUTHORS ChangeLog NEWS README
 	dodoc doc/configuration doc/isa_abi_headache
 	dohtml -r doc
 }
diff --git a/dev-libs/gmp/gmp-4.1.2.ebuild b/dev-libs/gmp/gmp-4.1.2.ebuild
index e511a259ef2d..933e31c21e7d 100644
--- a/dev-libs/gmp/gmp-4.1.2.ebuild
+++ b/dev-libs/gmp/gmp-4.1.2.ebuild
@@ -1,16 +1,18 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-4.1.2.ebuild,v 1.18 2004/04/03 09:31:23 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-4.1.2.ebuild,v 1.19 2004/04/21 16:39:16 vapier Exp $
 
 inherit flag-o-matic libtool
-filter-flags -ffast-math
 
 DESCRIPTION="Library for arithmetic on arbitrary precision integers, rational numbers, and floating-point numbers"
 HOMEPAGE="http://www.gnu.org/software/gmp/gmp.html"
 SRC_URI="mirror://gnu/gmp/${P}.tar.gz"
-SLOT="0"
+
 LICENSE="LGPL-2"
-KEYWORDS="x86 ppc sparc alpha amd64 ia64 ~mips hppa"
+SLOT="0"
+KEYWORDS="x86 ppc sparc ~mips alpha hppa amd64 ia64"
+IUSE=""
+
 DEPEND="~sys-devel/m4-1.4"
 
 src_unpack() {
@@ -21,6 +23,8 @@ src_unpack() {
 }
 
 src_compile() {
+	filter-flags -ffast-math
+
 	elibtoolize
 
 	local myconf=""
@@ -39,7 +43,7 @@ src_compile() {
 	# It's pretty slow to run all the checks, and not really necessary
 	# on every build of this package.  Just run the checks when
 	# debugging is enabled.  (23 Feb 2003 agriffis)
-	if [ `use debug` ] ; then
+	if use debug ; then
 		make check || die "make check failed"
 	fi
 }
@@ -47,7 +51,7 @@ src_compile() {
 src_install() {
 	make DESTDIR=${D} install || die "make install failed"
 
-	dodoc AUTHORS ChangeLog COPYING* NEWS README
+	dodoc AUTHORS ChangeLog NEWS README
 	dodoc doc/configuration doc/isa_abi_headache
 	dohtml -r doc
 }
diff --git a/dev-libs/ibpp/ibpp-1.0.5.2-r1.ebuild b/dev-libs/ibpp/ibpp-1.0.5.2-r1.ebuild
index eac58ad031e8..b03e562b5f71 100644
--- a/dev-libs/ibpp/ibpp-1.0.5.2-r1.ebuild
+++ b/dev-libs/ibpp/ibpp-1.0.5.2-r1.ebuild
@@ -1,14 +1,17 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ibpp/ibpp-1.0.5.2-r1.ebuild,v 1.12 2004/03/14 12:21:45 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ibpp/ibpp-1.0.5.2-r1.ebuild,v 1.13 2004/04/21 16:40:03 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="IBPP, a C++ client API for firebird 1.0"
 HOMEPAGE="http://www.ibpp.org/"
 SRC_URI="mirror://sourceforge/ibpp/${P//./-}-src.zip"
 
-SLOT="0"
 LICENSE="MPL-1.1"
+SLOT="0"
 KEYWORDS="x86 -sparc"
+IUSE=""
 
 DEPEND=">=sys-apps/portage-2.0.47-r10
 	>=dev-db/firebird-1.0"
@@ -25,11 +28,10 @@ src_compile() {
 	emake PLATFORM="linux" || die
 }
 
-src_install () {
-	dodir /usr/include
+src_install() {
 	insinto /usr/include
-	doins ibpp.h
+	doins ibpp.h || die "doins failed"
 	cd release/linux
-	dolib.so libibpp.so libibpp_core.so libibpp_helper.so
-	dolib.a libibpp.a libibpp_core.a libibpp_helper.a
+	dolib.so libibpp.so libibpp_core.so libibpp_helper.so || die "dolib.so failed"
+	dolib.a libibpp.a libibpp_core.a libibpp_helper.a || die "dolib.a failed"
 }
diff --git a/dev-libs/libaio/libaio-0.3.15.ebuild b/dev-libs/libaio/libaio-0.3.15.ebuild
index 580c6ffce243..fed1e7dd9077 100644
--- a/dev-libs/libaio/libaio-0.3.15.ebuild
+++ b/dev-libs/libaio/libaio-0.3.15.ebuild
@@ -1,11 +1,13 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libaio/libaio-0.3.15.ebuild,v 1.2 2004/03/14 12:28:57 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libaio/libaio-0.3.15.ebuild,v 1.3 2004/04/21 16:40:32 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="Asynchronous input/output library maintained by RedHat, required by Oracle9i AMD64 edition"
+HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/andrea/libaio/"
 #SRC_URI="mirror://gentoo/${P}.tar.bz2"
 SRC_URI="http://www.kernel.org/pub/linux/kernel/people/andrea/libaio/${P}-2.5-2.tar.bz2"
-HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/andrea/libaio/"
 
 LICENSE="LGPL-2"
 SLOT="0"
@@ -14,7 +16,7 @@ IUSE="nls"
 
 DEPEND=""
 
-S="${S}-2.5-2"
+S="${WORKDIR}/${P}-2.5-2"
 
 src_compile() {
 	cd ${S}
diff --git a/dev-libs/libextractor/libextractor-0.2.2.ebuild b/dev-libs/libextractor/libextractor-0.2.2.ebuild
index a0249333218b..e82695a70778 100644
--- a/dev-libs/libextractor/libextractor-0.2.2.ebuild
+++ b/dev-libs/libextractor/libextractor-0.2.2.ebuild
@@ -1,16 +1,18 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libextractor/libextractor-0.2.2.ebuild,v 1.8 2004/03/25 03:19:59 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libextractor/libextractor-0.2.2.ebuild,v 1.9 2004/04/21 16:41:26 vapier Exp $
 
-inherit libtool
+inherit libtool eutils
 
-IUSE="oggvorbis static"
 DESCRIPTION="A simple library for keyword extraction"
 HOMEPAGE="http://www.ovmj.org/~samanta/libextractor"
 SRC_URI="http://www.ovmj.org/~samanta/libextractor/download/${P}.tar.bz2"
-SLOT="0"
+
 LICENSE="LGPL-2.1"
+SLOT="0"
 KEYWORDS="x86 sparc"
+IUSE="oggvorbis static"
+
 # does not work with rpm-4.2
 DEPEND=">=sys-devel/libtool-1.4.1
 	<app-arch/rpm-4.2
@@ -19,22 +21,17 @@ DEPEND=">=sys-devel/libtool-1.4.1
 src_unpack() {
 	unpack ${A}
 	# patch their half baked attempt at supporting ogg vorbis
-	epatch ${FILESDIR}/${P}-vorbisfile.patch || die "patch failed"
+	epatch ${FILESDIR}/${P}-vorbisfile.patch
 }
 
 src_compile() {
 	elibtoolize
 
-	local myconf
-	myconf="--with-gnu-ld"
 	export CPPFLAGS="-I/usr/include/rpm"
-	use static \
-		&& myconf="${myconf} --enable-static" \
-		|| myconf="${myconf} --disable-static"
-	econf ${myconf}
+	econf `use_enable static` || die
 	make || die
 }
 
-src_install () {
+src_install() {
 	make DESTDIR=${D} install || die
 }
diff --git a/dev-libs/libezV24/libezV24-0.1.1.ebuild b/dev-libs/libezV24/libezV24-0.1.1.ebuild
index 6901f105118a..e1932dbee051 100644
--- a/dev-libs/libezV24/libezV24-0.1.1.ebuild
+++ b/dev-libs/libezV24/libezV24-0.1.1.ebuild
@@ -1,17 +1,20 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libezV24/libezV24-0.1.1.ebuild,v 1.1 2003/11/19 20:12:23 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libezV24/libezV24-0.1.1.ebuild,v 1.2 2004/04/21 16:42:16 vapier Exp $
 
-IUSE=""
-S=${WORKDIR}/${P}
-DESCRIPTION="libezV24 - library that provides an easy API to Linux serial ports"
-HOMEPAGE="http://ezv24.sf.net"
+inherit eutils
+
+DESCRIPTION="library that provides an easy API to Linux serial ports"
+HOMEPAGE="http://ezv24.sourceforge.net/"
 SRC_URI="mirror://sourceforge/ezv24/${P}.tar.gz"
-DEPEND=""
-RDEPEND=""
-SLOT="0"
+
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~x86 -ppc ~sparc ~alpha"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
 
 src_compile() {
 	epatch ${FILESDIR}/${P}-test-v24.c.diff
@@ -21,7 +24,7 @@ src_compile() {
 
 src_install() {
 	make install PREFIX=${D}usr || die "Make install failed"
-	dodoc AUTHORS BUGS COPYING ChangeLog HISTORY README
+	dodoc AUTHORS BUGS ChangeLog HISTORY README
 	dohtml api-html/*
 
 	# make install makes symlinks that don't exist when installed, so
diff --git a/dev-libs/libiiimcf/libiiimcf-11.4.1467.ebuild b/dev-libs/libiiimcf/libiiimcf-11.4.1467.ebuild
index 51b80c4b161b..23c119ee9689 100644
--- a/dev-libs/libiiimcf/libiiimcf-11.4.1467.ebuild
+++ b/dev-libs/libiiimcf/libiiimcf-11.4.1467.ebuild
@@ -1,20 +1,21 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiiimcf/libiiimcf-11.4.1467.ebuild,v 1.3 2004/03/10 20:31:36 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiiimcf/libiiimcf-11.4.1467.ebuild,v 1.4 2004/04/21 16:42:33 vapier Exp $
 
-inherit iiimf
+inherit iiimf eutils
 
 DESCRIPTION="A library to implement generic C interface for IIIM Client"
 
 KEYWORDS="~x86"
+
 DEPEND="dev-libs/eimil
 	dev-libs/libiiimp"
 
 S="${WORKDIR}/${IMSDK}/lib/iiimcf"
 
 src_unpack() {
-
 	unpack ${A}
 	epatch ${FILESDIR}/${P}-gentoo.diff
-	cd ${S} ; autoconf
+	cd ${S}
+	autoconf
 }
diff --git a/dev-libs/libmcal/libmcal-0.7-r1.ebuild b/dev-libs/libmcal/libmcal-0.7-r1.ebuild
index cecae6cc7a2d..9dec615ef076 100644
--- a/dev-libs/libmcal/libmcal-0.7-r1.ebuild
+++ b/dev-libs/libmcal/libmcal-0.7-r1.ebuild
@@ -1,33 +1,35 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmcal/libmcal-0.7-r1.ebuild,v 1.6 2004/01/10 17:44:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmcal/libmcal-0.7-r1.ebuild,v 1.7 2004/04/21 16:43:03 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="Modular Calendar Access Libary"
 HOMEPAGE="http://mcal.chek.com/"
 SRC_URI="mirror://sourceforge/libmcal/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-
 KEYWORDS="~x86 ppc ~sparc alpha hppa ~mips amd64 ia64"
-
 IUSE=""
+
 DEPEND=""
 RDEPEND=""
 S=${WORKDIR}/${PN}
 
 src_unpack() {
-	unpack ${A} ; cd ${S}
-
+	unpack ${A}
+	cd ${S}
 	epatch ${FILESDIR}/${P}-fpic.patch
 }
 
 src_compile() {
-	econf
+	econf || die
 	emake CFLAGS="${CFLAGS}" || die
 }
 
 src_install() {
 	einstall DESTDIR=${D} || die
-	dodoc CHANGELOG FAQ-MCAL FEATURE-IMPLEMENTATION HOW-TO-MCAL LICENSE README
+	dodoc CHANGELOG FAQ-MCAL FEATURE-IMPLEMENTATION HOW-TO-MCAL README
 	dohtml FUNCTION-REF.html
 }
diff --git a/dev-libs/lzo/lzo-1.08-r1.ebuild b/dev-libs/lzo/lzo-1.08-r1.ebuild
index 2bcbcc506413..def5171feafb 100644
--- a/dev-libs/lzo/lzo-1.08-r1.ebuild
+++ b/dev-libs/lzo/lzo-1.08-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/lzo/lzo-1.08-r1.ebuild,v 1.5 2004/03/07 17:06:48 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/lzo/lzo-1.08-r1.ebuild,v 1.6 2004/04/21 16:43:31 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="An extremely fast compression and decompression library"
 HOMEPAGE="http://www.oberhumer.com/opensource/lzo/"
@@ -9,6 +11,7 @@ SRC_URI="http://www.oberhumer.com/opensource/lzo/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ia64 ppc64"
+IUSE=""
 
 DEPEND="x86? ( dev-lang/nasm )"
 RDEPEND=""
@@ -25,9 +28,9 @@ src_compile() {
 	emake || die
 }
 
-src_install () {
+src_install() {
 	make DESTDIR=${D} install || die
-	dodoc AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README THANKS doc/LZO*
+	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README THANKS doc/LZO*
 	docinto examples
 	dodoc examples/*.c examples/Makefile
 }
diff --git a/dev-libs/nspr/nspr-4.3.ebuild b/dev-libs/nspr/nspr-4.3.ebuild
index 2ea63b43762e..878c52c821ad 100644
--- a/dev-libs/nspr/nspr-4.3.ebuild
+++ b/dev-libs/nspr/nspr-4.3.ebuild
@@ -1,14 +1,17 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.3.ebuild,v 1.11 2004/03/14 12:23:57 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.3.ebuild,v 1.12 2004/04/21 16:43:55 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="Netscape Portable Runtime"
-SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar.gz"
 HOMEPAGE="http://www.mozilla.org/projects/nspr/"
+SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="MPL-1.1"
+SLOT="0"
 KEYWORDS="x86 sparc ppc ~alpha ~amd64 hppa ~mips"
+IUSE=""
 
 DEPEND="virtual/glibc"
 
@@ -31,7 +34,7 @@ src_compile() {
 	make || die
 }
 
-src_install () {
+src_install() {
 	# Their build system is royally fucked, as usual
 	cd ${S}/build
 	make install
diff --git a/dev-libs/nspr/nspr-4.4.1.ebuild b/dev-libs/nspr/nspr-4.4.1.ebuild
index f25e3e232129..57703e635c64 100644
--- a/dev-libs/nspr/nspr-4.4.1.ebuild
+++ b/dev-libs/nspr/nspr-4.4.1.ebuild
@@ -1,14 +1,17 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.4.1.ebuild,v 1.6 2004/04/06 19:51:49 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.4.1.ebuild,v 1.7 2004/04/21 16:44:10 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="Netscape Portable Runtime"
-SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar.gz"
 HOMEPAGE="http://www.mozilla.org/projects/nspr/"
+SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="MPL-1.1"
+SLOT="0"
 KEYWORDS="x86 sparc ppc alpha ~amd64 hppa ~ia64 ~mips"
+IUSE=""
 
 DEPEND="virtual/glibc"
 
diff --git a/dev-libs/nss/nss-3.8.ebuild b/dev-libs/nss/nss-3.8.ebuild
index b449525b38f1..a8fa5f46d4c3 100644
--- a/dev-libs/nss/nss-3.8.ebuild
+++ b/dev-libs/nss/nss-3.8.ebuild
@@ -1,24 +1,23 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.8.ebuild,v 1.21 2004/04/06 19:57:44 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.8.ebuild,v 1.22 2004/04/21 16:44:57 vapier Exp $
 
-S=${WORKDIR}/${P}
+inherit eutils
 
 RTM_NAME="NSS_${PV/./_}_RTM"
 DESCRIPTION="Mozilla's Netscape Security Services Library that implements PKI support"
-SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz"
 HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
+SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="MPL-1.1"
+SLOT="0"
 KEYWORDS="x86 ppc sparc alpha ~amd64 ~ia64 ~mips hppa"
+IUSE=""
 
 DEPEND="virtual/glibc
 	app-arch/zip
 	>=dev-libs/nspr-4.3"
 
-MAKEOPTS="${MAKEOPTS} -j1"
-
 src_unpack() {
 	unpack ${A}
 
@@ -49,7 +48,7 @@ src_unpack() {
 		epatch ${FILESDIR}/${PN}-${PV}-hppa.patch
 	fi
 
-	if [ "`use mips`" ]; then
+	if use mips ; then
 		cd ${S}; epatch ${FILESDIR}/${PN}-${PV}-mips.patch
 	fi
 }
@@ -60,11 +59,11 @@ src_compile() {
 	# Fix for Linux 2.6
 	cp Linux2.5.mk Linux2.6.mk
 
-	emake BUILD_OPT=1 || die "coreconf make failed"
+	emake -j1 BUILD_OPT=1 || die "coreconf make failed"
 	cd ${S}/mozilla/security/dbm
-	emake BUILD_OPT=1 || die "dbm make failed"
+	emake -j1 BUILD_OPT=1 || die "dbm make failed"
 	cd ${S}/mozilla/security/nss
-	emake BUILD_OPT=1 || die "nss make failed"
+	emake -j1 BUILD_OPT=1 || die "nss make failed"
 }
 
 src_install () {
@@ -82,5 +81,4 @@ src_install () {
 	doins public/nss/*.h
 
 	# NOTE: we ignore the binary files
-
 }
diff --git a/dev-libs/oniguruma/oniguruma-2.1.0.ebuild b/dev-libs/oniguruma/oniguruma-2.1.0.ebuild
index 13788617cae2..f70ca623e614 100644
--- a/dev-libs/oniguruma/oniguruma-2.1.0.ebuild
+++ b/dev-libs/oniguruma/oniguruma-2.1.0.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/oniguruma/oniguruma-2.1.0.ebuild,v 1.2 2004/02/28 17:00:08 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/oniguruma/oniguruma-2.1.0.ebuild,v 1.3 2004/04/21 16:45:24 vapier Exp $
+
+inherit eutils
 
 MY_DATE=20040202
 MY_P="onigd${MY_DATE}"
@@ -10,7 +12,6 @@ HOMEPAGE="http://raa.ruby-lang.org/list.rhtml?name=oniguruma"
 SRC_URI="ftp://ftp.ruby-lang.org/pub/ruby/contrib/${MY_P}.tar.gz"
 
 LICENSE="BSD"
-
 SLOT="0"
 KEYWORDS="x86"
 IUSE=""
@@ -20,20 +21,12 @@ DEPEND="virtual/glibc"
 S=${WORKDIR}/${PN}
 
 src_unpack() {
-
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-${MY_DATE}.diff
 }
 
-src_compile() {
-
-	econf || die
-	emake || die
-}
-
 src_install() {
-
 	dodir /usr
 	make prefix=${D}/usr install || die
 
diff --git a/dev-libs/proj/proj-4.4.7-r1.ebuild b/dev-libs/proj/proj-4.4.7-r1.ebuild
index 982b66d9b9c1..08258f80543d 100644
--- a/dev-libs/proj/proj-4.4.7-r1.ebuild
+++ b/dev-libs/proj/proj-4.4.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/proj/proj-4.4.7-r1.ebuild,v 1.6 2004/04/21 06:15:52 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/proj/proj-4.4.7-r1.ebuild,v 1.7 2004/04/21 16:45:48 vapier Exp $
 
 inherit eutils
 
@@ -10,10 +10,10 @@ HOMEPAGE="http://proj.maptools.org/"
 SRC_URI="http://proj.maptools.org/dl/${P}.tar.gz
 	http://proj.maptools.org/dl/proj-nad27-1.1.tar.gz"
 
-SLOT="0"
-IUSE=""
 LICENSE="MIT"
+SLOT="0"
 KEYWORDS="x86 ~ppc ~sparc ~alpha ~mips ~hppa ~amd64"
+IUSE=""
 
 DEPEND="virtual/glibc"
 
@@ -26,11 +26,6 @@ src_unpack() {
 	TMPDIR=${T}  tar xvzf ${DISTDIR}/proj-nad27-1.1.tar.gz || die
 }
 
-src_compile() {
-	econf || die
-	emake || die
-}
-
 src_install() {
 	einstall || die
 	insinto /usr/share/proj
@@ -40,5 +35,5 @@ src_install() {
 	insopts -m 644
 	doins nad/pj_out27.dist
 	doins nad/pj_out83.dist
-	dodoc COPYING README NEWS AUTHORS INSTALL ChangeLog ${N}/README.NAD ${N}/README.NADUS
+	dodoc README NEWS AUTHORS INSTALL ChangeLog ${N}/README.NAD ${N}/README.NADUS
 }
diff --git a/dev-libs/pwlib/pwlib-1.3.11-r1.ebuild b/dev-libs/pwlib/pwlib-1.3.11-r1.ebuild
index d7d498c28178..6518aafd0a28 100644
--- a/dev-libs/pwlib/pwlib-1.3.11-r1.ebuild
+++ b/dev-libs/pwlib/pwlib-1.3.11-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.3.11-r1.ebuild,v 1.10 2004/03/09 00:48:59 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.3.11-r1.ebuild,v 1.11 2004/04/21 16:46:12 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="Libs needed for GnomeMeeting"
 HOMEPAGE="http://www.openh323.org/"
@@ -28,7 +30,7 @@ src_compile() {
 	export PWLIBDIR=${S}
 	export PWLIB_BUILD="yes"
 
-	if [ "`use ssl`" ]; then
+	if use ssl ; then
 		export OPENSSLFLAG=1
 		export OPENSSLDIR=/usr
 		export OPENSSLLIBS="-lssl -lcrypt"
diff --git a/dev-libs/pwlib/pwlib-1.5.0-r1.ebuild b/dev-libs/pwlib/pwlib-1.5.0-r1.ebuild
index 42fbd2def121..61d0b611bb42 100644
--- a/dev-libs/pwlib/pwlib-1.5.0-r1.ebuild
+++ b/dev-libs/pwlib/pwlib-1.5.0-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.5.0-r1.ebuild,v 1.1 2004/02/09 01:20:43 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.5.0-r1.ebuild,v 1.2 2004/04/21 16:46:39 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="Portable Multiplatform Class Libraries for OpenH323"
 HOMEPAGE="http://www.openh323.org/"
@@ -35,7 +37,7 @@ src_unpack() {
 }
 
 src_compile() {
-	if [ "`use ssl`" ]; then
+	if use ssl ; then
 		export OPENSSLFLAG=1
 		export OPENSSLDIR=/usr
 		export OPENSSLLIBS="-lssl -lcrypt"
diff --git a/dev-libs/pwlib/pwlib-1.5.2-r3.ebuild b/dev-libs/pwlib/pwlib-1.5.2-r3.ebuild
index 381b707f805a..7379411d21a0 100644
--- a/dev-libs/pwlib/pwlib-1.5.2-r3.ebuild
+++ b/dev-libs/pwlib/pwlib-1.5.2-r3.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.5.2-r3.ebuild,v 1.5 2004/03/30 22:25:15 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.5.2-r3.ebuild,v 1.6 2004/04/21 16:47:13 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="Portable Multiplatform Class Libraries for OpenH323"
 HOMEPAGE="http://www.openh323.org/"
@@ -19,7 +21,6 @@ DEPEND=">=sys-devel/bison-1.28
 	sdl? ( media-libs/libsdl )
 	ssl? ( dev-libs/openssl )"
 
-MAKEOPTS="${MAKEOPTS} -j1"
 S=${WORKDIR}/${PN}
 
 src_unpack() {
@@ -39,7 +40,7 @@ src_unpack() {
 }
 
 src_compile() {
-	if [ "`use ssl`" ]; then
+	if use ssl ; then
 		export OPENSSLFLAG=1
 		export OPENSSLDIR="/usr"
 		export OPENSSLLIBS="-lssl -lcrypt"
@@ -58,7 +59,7 @@ src_compile() {
 		-e "s:^\(CCFLAGS[\s]*=.*\) -I/usr/include:\1:" \
 		${S}/make/ptlib-config
 
-	emake opt || die "make failed"
+	emake -j1 opt || die "make failed"
 }
 
 src_install() {
diff --git a/dev-libs/xmlsec/xmlsec-1.2.2.ebuild b/dev-libs/xmlsec/xmlsec-1.2.2.ebuild
index f8f137742bec..2bd373f6e59e 100644
--- a/dev-libs/xmlsec/xmlsec-1.2.2.ebuild
+++ b/dev-libs/xmlsec/xmlsec-1.2.2.ebuild
@@ -1,11 +1,16 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlsec/xmlsec-1.2.2.ebuild,v 1.1 2004/01/04 11:33:43 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlsec/xmlsec-1.2.2.ebuild,v 1.2 2004/04/21 16:48:10 vapier Exp $
 
-DESCRIPTION="xmlsec is a command line tool for signing, verifying, encrypting and decrypting XML documents based on LibXML2 and OpenSSL. The library supports major XML security standards."
+DESCRIPTION="command line tool for signing, verifying, encrypting and decrypting XML"
 HOMEPAGE="http://www.aleksey.com/xmlsec"
-KEYWORDS="~x86 ~amd64"
+SRC_URI="http://www.aleksey.com/xmlsec/download/${PN}1-${PV}.tar.gz"
+
 LICENSE="MIT"
+KEYWORDS="~x86 ~amd64"
+SLOT="0"
+IUSE="ssl mozilla"
+
 DEPEND=">=sys-devel/autoconf-2.2
 	>=dev-libs/libxml2-2.4.2
 	>=dev-libs/libxslt-1.0.20
@@ -13,14 +18,12 @@ DEPEND=">=sys-devel/autoconf-2.2
 	>=net-libs/gnutls-0.8.1
 	mozilla? ( >=dev-libs/nspr-4.0
 		>=dev-libs/nss-3.2 )"
-SRC_URI="http://www.aleksey.com/xmlsec/download/${PN}1-${PV}.tar.gz"
+
 S=${WORKDIR}/${PN}1-${PV}
-IUSE="ssl mozilla"
-SLOT="0"
 
 src_unpack() {
-	unpack ${A} ; cd ${S}
-
+	unpack ${A}
+	cd ${S}
 	epatch ${FILESDIR}/${P}-nss-nspr-configure.in.patch
 }
 
@@ -29,7 +32,7 @@ src_compile() {
 
 	local myconf
 
-	if [ "`use ssl`" ] && [ "`best_version openssl | awk -F- '{print $3}' | sed 's/[a-z]//'`" == "0.9.7" ]; then
+	if use ssl && [ "`best_version openssl | awk -F- '{print $3}' | sed 's/[a-z]//'`" == "0.9.7" ]; then
 		myconf="--enable-aes"
 	else
 		myconf="--disable-aes"
@@ -43,6 +46,5 @@ src_compile() {
 }
 src_install() {
 	einstall || die "install failed"
-
-	dodoc AUTHORS COPYING INSTALL README NEWS
+	dodoc AUTHORS INSTALL README NEWS
 }
diff --git a/dev-libs/xmlwrapp/xmlwrapp-0.4.0.ebuild b/dev-libs/xmlwrapp/xmlwrapp-0.4.0.ebuild
index b4e49daf4059..965ad5b422da 100644
--- a/dev-libs/xmlwrapp/xmlwrapp-0.4.0.ebuild
+++ b/dev-libs/xmlwrapp/xmlwrapp-0.4.0.ebuild
@@ -1,14 +1,17 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlwrapp/xmlwrapp-0.4.0.ebuild,v 1.5 2004/02/21 11:40:12 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlwrapp/xmlwrapp-0.4.0.ebuild,v 1.6 2004/04/21 16:48:28 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="modern style C++ library that provides a simple and easy interface to libxml2"
-SRC_URI="http://pmade.org/software/xmlwrapp/download/${P}.tar.gz"
 HOMEPAGE="http://pmade.org/software/xmlwrapp/"
+SRC_URI="http://pmade.org/software/xmlwrapp/download/${P}.tar.gz"
 
-KEYWORDS="x86 ppc"
 LICENSE="BSD"
 SLOT="0"
+KEYWORDS="x86 ppc"
+IUSE=""
 
 DEPEND="virtual/glibc
 	dev-lang/perl
diff --git a/dev-libs/xmlwrapp/xmlwrapp-0.4.1.ebuild b/dev-libs/xmlwrapp/xmlwrapp-0.4.1.ebuild
index 3f618dae6233..a71a6398aff6 100644
--- a/dev-libs/xmlwrapp/xmlwrapp-0.4.1.ebuild
+++ b/dev-libs/xmlwrapp/xmlwrapp-0.4.1.ebuild
@@ -1,14 +1,17 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlwrapp/xmlwrapp-0.4.1.ebuild,v 1.2 2004/02/21 11:40:12 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlwrapp/xmlwrapp-0.4.1.ebuild,v 1.3 2004/04/21 16:48:44 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="modern style C++ library that provides a simple and easy interface to libxml2"
-SRC_URI="http://pmade.org/software/xmlwrapp/download/${P}.tar.gz"
 HOMEPAGE="http://pmade.org/software/xmlwrapp/"
+SRC_URI="http://pmade.org/software/xmlwrapp/download/${P}.tar.gz"
 
-KEYWORDS="~x86 ~ppc"
 LICENSE="BSD"
 SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
 
 DEPEND="virtual/glibc
 	dev-lang/perl
diff --git a/dev-libs/xmlwrapp/xmlwrapp-0.4.4.ebuild b/dev-libs/xmlwrapp/xmlwrapp-0.4.4.ebuild
index 1bc6e06091e2..a060827845a8 100644
--- a/dev-libs/xmlwrapp/xmlwrapp-0.4.4.ebuild
+++ b/dev-libs/xmlwrapp/xmlwrapp-0.4.4.ebuild
@@ -1,14 +1,17 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlwrapp/xmlwrapp-0.4.4.ebuild,v 1.1 2004/02/21 11:40:12 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlwrapp/xmlwrapp-0.4.4.ebuild,v 1.2 2004/04/21 16:49:08 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="modern style C++ library that provides a simple and easy interface to libxml2"
-SRC_URI="http://pmade.org/software/xmlwrapp/download/${P}.tar.gz"
 HOMEPAGE="http://pmade.org/software/xmlwrapp/"
+SRC_URI="http://pmade.org/software/xmlwrapp/download/${P}.tar.gz"
 
-KEYWORDS="~x86 ~ppc"
 LICENSE="BSD"
 SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
 
 DEPEND="virtual/glibc
 	dev-lang/perl
@@ -16,20 +19,17 @@ DEPEND="virtual/glibc
 	dev-libs/libxslt"
 
 src_unpack() {
-
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-gentoo.diff
 }
 
 src_compile() {
-
 	perl configure.pl --prefix /usr || die
 	emake || die
 }
 
 src_install() {
-
 	sed -i "s%/usr%${D}/usr%g" Makefile
 	make install || die