change glibc to libc and clean up other horribly ugly ebuilds

55 files changed, 301 insertions, 369 deletions

diff --git a/app-misc/aldo/aldo-0.0.11.ebuild b/app-misc/aldo/aldo-0.0.11.ebuild
index db9c104518c0..f9a59f2552b3 100644
--- a/app-misc/aldo/aldo-0.0.11.ebuild
+++ b/app-misc/aldo/aldo-0.0.11.ebuild
@@ -1,15 +1,17 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/aldo/aldo-0.0.11.ebuild,v 1.5 2004/06/24 22:01:31 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/aldo/aldo-0.0.11.ebuild,v 1.6 2004/06/28 03:23:52 vapier Exp $
 
-DESCRIPTION="ALDO is a morse tutor."
-HOMEPAGE="http://aldo.sourceforge.net"
+DESCRIPTION="a morse tutor"
+HOMEPAGE="http://aldo.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
 IUSE=""
-DEPEND="virtual/glibc"
+
+DEPEND="virtual/libc"
 
 src_compile() {
 	make libs || die
@@ -17,7 +19,6 @@ src_compile() {
 }
 
 src_install() {
-	mkdir -p ${D}/usr/bin
-	cp aldo ${D}/usr/bin
+	dobin aldo || die
 	dodoc README* TODO VERSION AUTHORS ChangeLog
 }
diff --git a/app-misc/away/away-0.9.5.ebuild b/app-misc/away/away-0.9.5.ebuild
index a329b0acc959..fd8df20d81fc 100644
--- a/app-misc/away/away-0.9.5.ebuild
+++ b/app-misc/away/away-0.9.5.ebuild
@@ -1,18 +1,20 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/away/away-0.9.5.ebuild,v 1.4 2004/06/24 22:02:18 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/away/away-0.9.5.ebuild,v 1.5 2004/06/28 03:24:46 vapier Exp $
 
 DESCRIPTION="Terminal locking program with few additional features"
 HOMEPAGE="http://unbeatenpath.net/software/away/"
 SRC_URI="http://unbeatenpath.net/software/away/${P}.tar.bz2"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 sparc"
-DEPEND="virtual/glibc"
-RDEPEND=">=sys-libs/pam-0.75"
 IUSE=""
 
-src_unpack () {
+DEPEND="virtual/libc"
+RDEPEND=">=sys-libs/pam-0.75"
+
+src_unpack() {
 	unpack ${A}
 	sed -i "s:-O2:${CFLAGS}:" ${S}/Makefile
 }
@@ -21,9 +23,8 @@ src_compile() {
 }
 
 src_install() {
-	into /usr
-	dobin away
+	dobin away || die
 	insinto /etc/pam.d ; newins data/away.pam away
 	doman doc/*
-	dodoc BUGS AUTHORS COPYING NEWS README TODO data/awayrc
+	dodoc BUGS AUTHORS NEWS README TODO data/awayrc
 }
diff --git a/app-misc/banner/banner-1.2.1.ebuild b/app-misc/banner/banner-1.2.1.ebuild
index b1681ba63bf0..3abee80d4563 100644
--- a/app-misc/banner/banner-1.2.1.ebuild
+++ b/app-misc/banner/banner-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/banner/banner-1.2.1.ebuild,v 1.8 2004/06/28 00:44:48 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/banner/banner-1.2.1.ebuild,v 1.9 2004/06/28 03:25:07 vapier Exp $
 
 DESCRIPTION="The well known banner program for linux"
 HOMEPAGE="http://cedar-solutions.com"
@@ -8,17 +8,12 @@ SRC_URI="http://cedar-solutions.com/software/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc amd64 sparc ~mips"
+KEYWORDS="x86 ~ppc sparc ~mips amd64"
 IUSE=""
 
-DEPEND="virtual/glibc"
-
-src_compile() {
-	econf || die "econf failed"
-	emake || die
-}
+DEPEND="virtual/libc"
 
 src_install() {
-	einstall
-	dodoc README AUTHORS COPYING INSTALL
+	einstall || die
+	dodoc README AUTHORS INSTALL
 }
diff --git a/app-misc/beep/beep-1.2.2.ebuild b/app-misc/beep/beep-1.2.2.ebuild
index 52bac6b35a4e..bf444ebbc6a7 100644
--- a/app-misc/beep/beep-1.2.2.ebuild
+++ b/app-misc/beep/beep-1.2.2.ebuild
@@ -1,23 +1,23 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/beep/beep-1.2.2.ebuild,v 1.13 2004/06/24 22:02:55 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/beep/beep-1.2.2.ebuild,v 1.14 2004/06/28 03:25:56 vapier Exp $
 
-DESCRIPTION="Beep, the advanced PC speaker beeper"
+DESCRIPTION="the advanced PC speaker beeper"
 HOMEPAGE="http://www.johnath.com/beep/"
 SRC_URI="http://www.johnath.com/beep/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-IUSE=""
+SLOT="0"
 KEYWORDS="x86 ppc alpha amd64"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_compile() {
 	emake || die "compile problem"
 }
 
-src_install () {
+src_install() {
 	dodir /usr/bin
 	dodir /usr/share/man/man1
 
@@ -28,5 +28,5 @@ src_install () {
 	insinto /usr/share/man/man1
 	doins beep.1.gz
 
-	dodoc CHANGELOG COPYING CREDITS README
+	dodoc CHANGELOG CREDITS README
 }
diff --git a/app-misc/bfr/bfr-1.5.ebuild b/app-misc/bfr/bfr-1.5.ebuild
index 0d37b72847a5..4bc7c266cfb7 100644
--- a/app-misc/bfr/bfr-1.5.ebuild
+++ b/app-misc/bfr/bfr-1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/bfr/bfr-1.5.ebuild,v 1.6 2004/06/24 22:03:06 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/bfr/bfr-1.5.ebuild,v 1.7 2004/06/28 03:26:22 vapier Exp $
 
 DESCRIPTION="Buffer (bfr) is a general-purpose command-line pipe buffer"
 HOMEPAGE="http://www.glines.org:8000/software/buffer.html"
@@ -8,12 +8,12 @@ SRC_URI="http://www.glines.org:8000/bin/pk/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
 KEYWORDS="x86"
+IUSE=""
 
 DEPEND=""
 
 src_install() {
 	einstall || die "install failed"
-	dodoc AUTHORS COPYING INSTALL Changelog NEWS README TODO
+	dodoc AUTHORS INSTALL Changelog NEWS README TODO
 }
diff --git a/app-misc/boxes/boxes-1.0.1.ebuild b/app-misc/boxes/boxes-1.0.1.ebuild
index 8a115d2a0615..8f850f236a38 100644
--- a/app-misc/boxes/boxes-1.0.1.ebuild
+++ b/app-misc/boxes/boxes-1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/boxes/boxes-1.0.1.ebuild,v 1.18 2004/06/28 00:48:38 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/boxes/boxes-1.0.1.ebuild,v 1.19 2004/06/28 03:27:29 vapier Exp $
 
 inherit eutils
 
@@ -10,10 +10,10 @@ SRC_URI="ftp://metalab.unc.edu/pub/Linux/utils/text/${P}.src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="x86 ppc ~sparc ~mips alpha"
 IUSE=""
-KEYWORDS="x86 ppc alpha ~sparc ~mips"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
diff --git a/app-misc/calendar/calendar-0.9.1.ebuild b/app-misc/calendar/calendar-0.9.1.ebuild
index f4909ab88f11..84bf5ff44961 100644
--- a/app-misc/calendar/calendar-0.9.1.ebuild
+++ b/app-misc/calendar/calendar-0.9.1.ebuild
@@ -1,21 +1,22 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/calendar/calendar-0.9.1.ebuild,v 1.12 2004/06/28 00:55:12 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/calendar/calendar-0.9.1.ebuild,v 1.13 2004/06/28 03:27:52 vapier Exp $
 
-DESCRIPTION="Standard unix calendar program for Linux, ported from OpenBSD."
+DESCRIPTION="Standard unix calendar program for Linux, ported from OpenBSD"
 HOMEPAGE="http://bsdcalendar.sourceforge.net/"
 SRC_URI="http://bsdcalendar.sourceforge.net/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="x86 ~ppc sparc alpha mips ~hppa amd64"
+KEYWORDS="x86 ~ppc sparc mips alpha ~hppa amd64"
 IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_compile() {
 	emake || die "emake failed"
 }
+
 src_install() {
 	dodoc README
 	cp -R "${S}/calendars" "${D}/usr/share/calendar" || die "cp failed"
diff --git a/app-misc/cbtracker/cbtracker-1.0b.ebuild b/app-misc/cbtracker/cbtracker-1.0b.ebuild
index 1e1e7cfe4fa0..4b03602b99a2 100644
--- a/app-misc/cbtracker/cbtracker-1.0b.ebuild
+++ b/app-misc/cbtracker/cbtracker-1.0b.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/cbtracker/cbtracker-1.0b.ebuild,v 1.3 2004/06/24 22:04:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/cbtracker/cbtracker-1.0b.ebuild,v 1.4 2004/06/28 03:28:08 vapier Exp $
 
 DESCRIPTION="CheckBook Tracker finance manager"
 HOMEPAGE="http://tony.maro.net/mod.php?mod=userpage&page_id=4"
@@ -11,8 +11,8 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc"
 IUSE=""
 
-DEPEND="virtual/glibc
-		virtual/x11"
+DEPEND="virtual/libc
+	virtual/x11"
 RDEPEND=""
 
 S="${WORKDIR}/${PN}"
@@ -22,12 +22,9 @@ src_compile() {
 }
 
 src_install() {
-
-	dobin cbtracker
+	dobin cbtracker || die
 	dohtml ${S}/help/*
 	dodir /usr/share/icons
 	mv ${S}/cbt_icon.xpm ${D}/usr/share/icons/
 	dodoc README
-
 }
-
diff --git a/app-misc/cdctl/cdctl-0.15.ebuild b/app-misc/cdctl/cdctl-0.15.ebuild
index 45c362fffbb1..4d826c36088b 100644
--- a/app-misc/cdctl/cdctl-0.15.ebuild
+++ b/app-misc/cdctl/cdctl-0.15.ebuild
@@ -1,20 +1,20 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/cdctl/cdctl-0.15.ebuild,v 1.10 2004/06/24 22:05:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/cdctl/cdctl-0.15.ebuild,v 1.11 2004/06/28 03:28:37 vapier Exp $
 
 inherit eutils
 EPATCH_SOURCE=${FILESDIR}
 
 DESCRIPTION="Utility to control your cd/dvd drive"
-SRC_URI="mirror://sourceforge/cdctl/${P}.tar.gz"
 HOMEPAGE="http://cdctl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/cdctl/${P}.tar.gz"
 
+LICENSE="free-noncomm"
+SLOT="0"
 KEYWORDS="x86 ~ppc ~amd64"
 IUSE=""
-SLOT="0"
-LICENSE="free-noncomm"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
@@ -24,5 +24,5 @@ src_unpack() {
 
 src_install() {
 	make DESTDIR=${D} install || die
-	dodoc NEWS NUTSANDBOLTS LICENSE PUBLICKEY README
+	dodoc NEWS NUTSANDBOLTS PUBLICKEY README
 }
diff --git a/app-misc/cdspeed/cdspeed-0.3.ebuild b/app-misc/cdspeed/cdspeed-0.3.ebuild
index 42988a36561b..787d52948f72 100644
--- a/app-misc/cdspeed/cdspeed-0.3.ebuild
+++ b/app-misc/cdspeed/cdspeed-0.3.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/cdspeed/cdspeed-0.3.ebuild,v 1.8 2004/06/24 22:05:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/cdspeed/cdspeed-0.3.ebuild,v 1.9 2004/06/28 03:29:06 vapier Exp $
 
-DESCRIPTION="Change the speed of your CD drive."
+DESCRIPTION="Change the speed of your CD drive"
 HOMEPAGE="http://linuxfocus.org/~guido/"
 SRC_URI="http://linuxfocus.org/~guido/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc alpha ~hppa ~mips ~amd64"
+KEYWORDS="x86 ~ppc ~sparc ~mips alpha ~hppa ~amd64"
 IUSE=""
 
-RDEPEND="virtual/glibc"
+RDEPEND="virtual/libc"
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
 
@@ -19,8 +19,8 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	sed -i \
-		-e 's:^CFLAGS=.*:CFLAGS=$(E_CFLAGS):' Makefile \
-			|| die "sed Makefile failed"
+		-e 's:^CFLAGS=.*:CFLAGS=$(E_CFLAGS):' \
+		Makefile || die "sed Makefile failed"
 }
 
 src_compile() {
diff --git a/app-misc/color/color-1.1.ebuild b/app-misc/color/color-1.1.ebuild
index bc4c71a72f17..35849060d283 100644
--- a/app-misc/color/color-1.1.ebuild
+++ b/app-misc/color/color-1.1.ebuild
@@ -1,23 +1,22 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/color/color-1.1.ebuild,v 1.7 2004/06/28 00:59:04 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/color/color-1.1.ebuild,v 1.8 2004/06/28 03:29:42 vapier Exp $
 
 inherit ccc
 
 DESCRIPTION="Easily add ANSI colouring to shell scripts"
 HOMEPAGE="http://runslinux.net/projects.html#color"
-
 SRC_URI="http://runslinux.net/projects/color/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-
-KEYWORDS="x86 alpha ~sparc ~mips"
+KEYWORDS="x86 ~sparc ~mips alpha"
 IUSE=""
-DEPEND="virtual/glibc"
+
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
-
 	# replace hardcoded compiler and CFLAGS.
 	replace-cc-hardcode
 	sed -i "s/-W -Wall -O2 -g/${CFLAGS}/g" ${S}/Makefile
@@ -25,14 +24,13 @@ src_unpack() {
 
 src_compile() {
 	emake || die
-
 	# some feedback everything went ok.
 	echo; ls -l color; size color
 }
 
 src_install() {
 	dobin color
-	dodoc CHANGELOG COPYING README
+	dodoc CHANGELOG README
 
 	# symlink for british users.
 	dosym /usr/bin/color /usr/bin/colour
diff --git a/app-misc/colordiff/colordiff-1.0.3.ebuild b/app-misc/colordiff/colordiff-1.0.3.ebuild
index 87ca97081d9e..bd408afce393 100644
--- a/app-misc/colordiff/colordiff-1.0.3.ebuild
+++ b/app-misc/colordiff/colordiff-1.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/colordiff/colordiff-1.0.3.ebuild,v 1.11 2004/06/24 22:06:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/colordiff/colordiff-1.0.3.ebuild,v 1.12 2004/06/28 03:30:00 vapier Exp $
 
 DESCRIPTION="Colorizes output of diff"
 HOMEPAGE="http://colordiff.sourceforge.net/"
@@ -8,16 +8,16 @@ SRC_URI="mirror://sourceforge/colordiff/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc sparc ~alpha ~mips"
+KEYWORDS="x86 ~ppc sparc ~mips ~alpha"
 IUSE=""
 
 DEPEND="sys-apps/diffutils"
 
 src_install() {
-	newbin colordiff.pl colordiff
+	newbin colordiff.pl colordiff || die
 	insinto /etc
 	doins colordiffrc
 	fowners root:root /etc/colordiffrc
 	fperms 644 /etc/colordiffrc
-	dodoc BUGS CHANGES COPYING README TODO
+	dodoc BUGS CHANGES README TODO
 }
diff --git a/app-misc/colordiff/colordiff-1.0.4.ebuild b/app-misc/colordiff/colordiff-1.0.4.ebuild
index 2a0de31f6aca..8f2097598ac0 100644
--- a/app-misc/colordiff/colordiff-1.0.4.ebuild
+++ b/app-misc/colordiff/colordiff-1.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/colordiff/colordiff-1.0.4.ebuild,v 1.8 2004/06/28 01:00:49 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/colordiff/colordiff-1.0.4.ebuild,v 1.9 2004/06/28 03:30:00 vapier Exp $
 
 DESCRIPTION="Colorizes output of diff"
 HOMEPAGE="http://colordiff.sourceforge.net/"
@@ -8,16 +8,16 @@ SRC_URI="mirror://sourceforge/colordiff/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 alpha sparc ~mips"
+KEYWORDS="~x86 alpha ~mips sparc"
 IUSE=""
 
 DEPEND="sys-apps/diffutils"
 
 src_install() {
-	newbin colordiff.pl colordiff
+	newbin colordiff.pl colordiff || die
 	insinto /etc
 	doins colordiffrc colordiffrc-lightbg
 	fowners root:root /etc/colordiffrc /etc/colordiffrc-lightbg
 	fperms 644 /etc/colordiffrc /etc/colordiffrc-lightbg
-	dodoc BUGS CHANGES COPYING README TODO
+	dodoc BUGS CHANGES README TODO
 }
diff --git a/app-misc/colortail/colortail-0.3.0-r2.ebuild b/app-misc/colortail/colortail-0.3.0-r2.ebuild
index 5add8d4b7d58..dd5f9c1327fe 100644
--- a/app-misc/colortail/colortail-0.3.0-r2.ebuild
+++ b/app-misc/colortail/colortail-0.3.0-r2.ebuild
@@ -1,23 +1,24 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/colortail/colortail-0.3.0-r2.ebuild,v 1.11 2004/06/24 22:06:36 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/colortail/colortail-0.3.0-r2.ebuild,v 1.12 2004/06/28 03:30:17 vapier Exp $
+
+inherit eutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Colortail custom colors your log files and works like tail"
-SRC_URI="http://www.student.hk-r.se/~pt98jan/colortail-0.3.0.tar.gz"
 HOMEPAGE="http://www.student.hk-r.se/~pt98jan/colortail.html"
+SRC_URI="http://www.student.hk-r.se/~pt98jan/colortail-0.3.0.tar.gz"
 
-DEPEND="virtual/glibc"
-
-SLOT="0"
 LICENSE="GPL-2"
-IUSE=""
+SLOT="0"
 KEYWORDS="x86 ppc"
+IUSE=""
+
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	patch -p1 < ${FILESDIR}/${P}-gcc3.patch || die "Patching failed"
+	epatch ${FILESDIR}/${P}-gcc3.patch
 }
 
 src_compile() {
@@ -25,8 +26,7 @@ src_compile() {
 	make || die
 }
 
-src_install()  {
-
+src_install() {
 	make DESTDIR=${D} install || die
 	dodoc README example-conf/conf*
 	dodir /usr/bin/wrappers
@@ -34,8 +34,7 @@ src_install()  {
 }
 
 pkg_postinst() {
-	einfo
-	if grep /usr/bin/wrappers /etc/profile > /dev/null
+	if grep /usr/bin/wrappers ${ROOT}/etc/profile > /dev/null
 	then
 		einfo "/etc/profile already updated for wrappers"
 	else
@@ -44,5 +43,4 @@ pkg_postinst() {
 		einfo "#Put /usr/bin/wrappers in path before /usr/bin"
 		einfo 'export PATH=/usr/bin/wrappers:${PATH}'
 	fi
-	einfo
 }
diff --git a/app-misc/countrycodes/countrycodes-1.0.5.ebuild b/app-misc/countrycodes/countrycodes-1.0.5.ebuild
index 2b376eb2afb2..22f1f0958edb 100644
--- a/app-misc/countrycodes/countrycodes-1.0.5.ebuild
+++ b/app-misc/countrycodes/countrycodes-1.0.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/countrycodes/countrycodes-1.0.5.ebuild,v 1.5 2004/06/28 01:08:52 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/countrycodes/countrycodes-1.0.5.ebuild,v 1.6 2004/06/28 03:30:35 vapier Exp $
 
-DESCRIPTION="An ISO 3166 country code finder."
+DESCRIPTION="An ISO 3166 country code finder"
 HOMEPAGE="http://www.grigna.com/diego/linux/countrycodes/"
 SRC_URI="http://www.grigna.com/diego/linux/${PN}/${P}.tar.gz"
 
@@ -11,7 +11,7 @@ SLOT="0"
 KEYWORDS="x86 ~sparc ~mips"
 IUSE=""
 
-RDEPEND="virtual/glibc"
+RDEPEND="virtual/libc"
 DEPEND="${RDEPEND}
 	sys-apps/sed"
 
@@ -19,7 +19,7 @@ src_compile() {
 	emake -C src $MAKEOPTS CCOPTS="$CFLAGS" || die "emake failed"
 }
 
-src_install () {
+src_install() {
 	dodir /usr/bin /usr/share/man/man1
 	make \
 		-C src \
diff --git a/app-misc/delay/delay-1.6.ebuild b/app-misc/delay/delay-1.6.ebuild
index 15101e89d21e..9f492a068402 100644
--- a/app-misc/delay/delay-1.6.ebuild
+++ b/app-misc/delay/delay-1.6.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/delay/delay-1.6.ebuild,v 1.10 2004/06/28 01:14:07 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/delay/delay-1.6.ebuild,v 1.11 2004/06/28 03:30:57 vapier Exp $
 
-DESCRIPTION="Delay is a sleeplike program that counts down the number of seconds specified on its command line."
+DESCRIPTION="sleeplike program that counts down the number of seconds specified"
 HOMEPAGE="http://onegeek.org/~tom/software/delay/"
-IUSE=""
-KEYWORDS="x86 ppc ~amd64 ~sparc ~mips"
 SRC_URI="http://onegeek.org/~tom/software/delay/dl/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="x86 ppc ~sparc ~mips ~amd64"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_compile() {
 	sed -i -e "s/#include <stdio.h>/&\n#include <stdlib.h>/" delay.c
@@ -22,7 +23,7 @@ src_compile() {
 	emake || die
 }
 
-src_install () {
+src_install() {
 	make DESTDIR=${D} install || die
-	dodoc ChangeLog README COPYING INSTALL
+	dodoc ChangeLog README INSTALL
 }
diff --git a/app-misc/devtodo/devtodo-0.1.17.ebuild b/app-misc/devtodo/devtodo-0.1.17.ebuild
index 0a701c1bbccf..ecfbeed2b5b0 100644
--- a/app-misc/devtodo/devtodo-0.1.17.ebuild
+++ b/app-misc/devtodo/devtodo-0.1.17.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/devtodo/devtodo-0.1.17.ebuild,v 1.13 2004/06/28 01:15:52 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/devtodo/devtodo-0.1.17.ebuild,v 1.14 2004/06/28 03:31:19 vapier Exp $
 
 inherit eutils gnuconfig
 
-IUSE=""
 DESCRIPTION="A nice command line todo list for developers"
 HOMEPAGE="http://devtodo.sourceforge.net/"
 SRC_URI="http://devtodo.sourceforge.net/${PV}/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha ~hppa mips amd64 ~ia64 s390"
+SLOT="0"
+KEYWORDS="x86 ppc sparc mips alpha ~hppa amd64 ~ia64 s390"
+IUSE=""
 
 DEPEND=">=sys-libs/ncurses-5.2
 	>=sys-libs/readline-4.1"
@@ -19,21 +19,18 @@ DEPEND=">=sys-libs/ncurses-5.2
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-
 	# Patch to allow compilation with gcc-3.3
 	epatch ${FILESDIR}/${PN}.patch
 }
 
 src_compile() {
 	gnuconfig_update
-
-	econf  \
-		--sysconfdir=/etc/devtodo || die
+	econf --sysconfdir=/etc/devtodo || die
 	emake || die
 }
 
 src_install() {
 	make DESTDIR=${D} install || die
-	dodoc AUTHORS COPYING ChangeLog QuickStart README TODO
+	dodoc AUTHORS ChangeLog QuickStart README TODO
 	dodoc doc/scripts.sh doc/scripts.tcsh doc/todorc.example contrib/tdrec
 }
diff --git a/app-misc/digitemp/digitemp-3.2.0.ebuild b/app-misc/digitemp/digitemp-3.2.0.ebuild
index e39047f19738..eaf04e442673 100644
--- a/app-misc/digitemp/digitemp-3.2.0.ebuild
+++ b/app-misc/digitemp/digitemp-3.2.0.ebuild
@@ -1,18 +1,17 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/digitemp/digitemp-3.2.0.ebuild,v 1.4 2004/06/24 22:08:19 agriffis Exp $
-
-IUSE="perl python"
+# $Header: /var/cvsroot/gentoo-x86/app-misc/digitemp/digitemp-3.2.0.ebuild,v 1.5 2004/06/28 03:31:40 vapier Exp $
 
 DESCRIPTION="Temperature logging and reporting using Dallas Semiconductor's iButtons and 1-Wire protocol"
 HOMEPAGE="http://www.digitemp.com http://www.ibutton.com"
 SRC_URI="http://www.digitemp.com/software/linux/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86"
+IUSE="perl python"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_compile() {
 	# default is to compile to the ds9097u. local use flag takes care of
@@ -32,8 +31,8 @@ src_compile() {
 }
 
 src_install() {
-	dobin digitemp
-	dodoc README COPYING FAQ TODO
+	dobin digitemp || die
+	dodoc README FAQ TODO
 
 	# method one: don't treat the examples as docs; place them somewhere else.
 	# then tell the user where to find this stuff. suitable alternative:
diff --git a/app-misc/digitemp/digitemp-3.3.1.ebuild b/app-misc/digitemp/digitemp-3.3.1.ebuild
index 6e78b4f6c272..d053d732d84c 100644
--- a/app-misc/digitemp/digitemp-3.3.1.ebuild
+++ b/app-misc/digitemp/digitemp-3.3.1.ebuild
@@ -1,18 +1,17 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/digitemp/digitemp-3.3.1.ebuild,v 1.3 2004/06/24 22:08:19 agriffis Exp $
-
-IUSE="perl python"
+# $Header: /var/cvsroot/gentoo-x86/app-misc/digitemp/digitemp-3.3.1.ebuild,v 1.4 2004/06/28 03:31:40 vapier Exp $
 
 DESCRIPTION="Temperature logging and reporting using Dallas Semiconductor's iButtons and 1-Wire protocol"
 HOMEPAGE="http://www.digitemp.com http://www.ibutton.com"
 SRC_URI="http://www.digitemp.com/software/linux/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~x86"
+IUSE="perl python"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_compile() {
 	# default is to compile to the ds9097u. local use flag takes care of
@@ -32,8 +31,8 @@ src_compile() {
 }
 
 src_install() {
-	dobin digitemp
-	dodoc README COPYING FAQ TODO
+	dobin digitemp || die
+	dodoc README FAQ TODO
 
 	# method one: don't treat the examples as docs; place them somewhere else.
 	# then tell the user where to find this stuff. suitable alternative:
diff --git a/app-misc/discomatic/discomatic-0.3.ebuild b/app-misc/discomatic/discomatic-0.3.ebuild
index a591ad18f3e2..68cbe8afe78a 100644
--- a/app-misc/discomatic/discomatic-0.3.ebuild
+++ b/app-misc/discomatic/discomatic-0.3.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/discomatic/discomatic-0.3.ebuild,v 1.2 2004/06/24 22:08:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/discomatic/discomatic-0.3.ebuild,v 1.3 2004/06/28 03:31:57 vapier Exp $
 
 inherit gnome2
 
-IUSE=""
-
 DESCRIPTION="GTK+ CD-ROM archiving tool for mastering and burning multiple CD-ROM"
 HOMEPAGE="http://discomatic.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
@@ -13,11 +11,11 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
+IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.2
 	>=x11-libs/gtk+-2.2"
-
 DEPEND="${RDEPEND}
 	 dev-util/pkgconfig"
 
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO"
+DOCS="AUTHORS ChangeLog INSTALL NEWS README* TODO"
diff --git a/app-misc/egads/egads-0.9.5.ebuild b/app-misc/egads/egads-0.9.5.ebuild
index 50446139d890..1e856b0aeb15 100644
--- a/app-misc/egads/egads-0.9.5.ebuild
+++ b/app-misc/egads/egads-0.9.5.ebuild
@@ -1,30 +1,29 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/egads/egads-0.9.5.ebuild,v 1.3 2004/06/24 22:09:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/egads/egads-0.9.5.ebuild,v 1.4 2004/06/28 03:32:35 vapier Exp $
 
-DESCRIPTION="EGADS - Entropy Gathering And Distribution System"
+DESCRIPTION="Entropy Gathering And Distribution System"
 HOMEPAGE="http://www.securesoftware.com/download_${PN}.htm"
 SRC_URI="http://www.securesoftware.com/${PN}/${P}.tar.gz"
+
 LICENSE="BSD"
 SLOT="0"
-IUSE=""
 KEYWORDS="x86"
-DEPEND="virtual/glibc"
+IUSE=""
+
+DEPEND="virtual/libc"
 
 egadsdatadir=/var/run/egads
 
 src_compile() {
 	econf --with-egads-datadir="${egadsdatadir}" --with-bindir=/usr/sbin || die
 	emake || die
-
-
 }
 
-src_install () {
+src_install() {
 	keepdir ${egadsdatadir}
 	fperm +t ${egadsdatadir}
 	einstall BINDIR=${D}/usr/sbin || die
 	dodoc README* doc/*.txt
 	dohtml doc/*.html
 }
-
diff --git a/app-misc/evidence/evidence-0.9.8.20040522.ebuild b/app-misc/evidence/evidence-0.9.8.20040522.ebuild
index cac1af22167d..907210bdad26 100644
--- a/app-misc/evidence/evidence-0.9.8.20040522.ebuild
+++ b/app-misc/evidence/evidence-0.9.8.20040522.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/evidence/evidence-0.9.8.20040522.ebuild,v 1.2 2004/06/24 22:10:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/evidence/evidence-0.9.8.20040522.ebuild,v 1.3 2004/06/28 03:33:53 vapier Exp $
 
 inherit enlightenment eutils flag-o-matic
 
@@ -20,7 +20,7 @@ DEPEND=">=dev-util/pkgconfig-0.5
 	truetype? ( =media-libs/freetype-2* )
 	kde? ( kde-base/kdelibs )
 	media-libs/libao
-	virtual/glibc
+	virtual/libc
 	sys-devel/gcc
 	app-admin/fam
 	>=sys-fs/efsd-0.0.1.20031013
diff --git a/app-misc/figlet/figlet-221-r1.ebuild b/app-misc/figlet/figlet-221-r1.ebuild
index b48ebaff1395..8edfeb498682 100644
--- a/app-misc/figlet/figlet-221-r1.ebuild
+++ b/app-misc/figlet/figlet-221-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/figlet/figlet-221-r1.ebuild,v 1.4 2004/06/24 22:11:06 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/figlet/figlet-221-r1.ebuild,v 1.5 2004/06/28 03:34:31 vapier Exp $
 
 inherit eutils
 
@@ -15,12 +15,12 @@ SRC_URI="ftp://ftp.figlet.org/pub/figlet/program/unix/${MY_P}.tar.gz
 	mirror://gentoo/contributed-${P}.tar.gz
 	mirror://gentoo/ms-dos-${P}.tar.gz"
 
-KEYWORDS="x86 ppc sparc alpha mips hppa"
 LICENSE="Artistic"
 SLOT="0"
+KEYWORDS="x86 ppc sparc mips alpha hppa"
 IUSE=""
 
-RDEPEND="virtual/glibc"
+RDEPEND="virtual/libc"
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
 
@@ -40,7 +40,7 @@ src_unpack() {
 }
 
 src_compile() {
-	make clean   || die "make clean failed"
+	make clean || die "make clean failed"
 	emake figlet || die "emake failed"
 }
 
diff --git a/app-misc/filer/filer-0.0.5.ebuild b/app-misc/filer/filer-0.0.5.ebuild
index 8f1cbe2d33e2..7c2a39b47c0a 100644
--- a/app-misc/filer/filer-0.0.5.ebuild
+++ b/app-misc/filer/filer-0.0.5.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/filer/filer-0.0.5.ebuild,v 1.2 2004/06/24 22:11:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/filer/filer-0.0.5.ebuild,v 1.3 2004/06/28 03:34:49 vapier Exp $
 
 DESCRIPTION="Small file-manager written in perl"
 HOMEPAGE="http://public.rz.fh-wolfenbuettel.de/~luedickj/"
 SRC_URI="http://public.rz.fh-wolfenbuettel.de/~luedickj/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
@@ -21,9 +22,7 @@ DEPEND="dev-lang/perl
 S=${WORKDIR}/${PN}
 
 src_install() {
-	dobin filer.pl
-	dodoc COPYING
+	dobin filer.pl || die
 	dodir /usr/lib/filer
 	cp -R filer.glade filer.gladep Filer icons lib.pl ${D}/usr/lib/filer
 }
-
diff --git a/app-misc/fixdos/fixdos-1.3.1.ebuild b/app-misc/fixdos/fixdos-1.3.1.ebuild
index d4467b6e77b0..e72b64e33805 100644
--- a/app-misc/fixdos/fixdos-1.3.1.ebuild
+++ b/app-misc/fixdos/fixdos-1.3.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/fixdos/fixdos-1.3.1.ebuild,v 1.10 2004/06/24 22:11:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/fixdos/fixdos-1.3.1.ebuild,v 1.11 2004/06/28 03:35:06 vapier Exp $
 
 inherit eutils
 
-DESCRIPTION="Set of utilities such as crlf which converts files between UNIX and DOS newlines."
+DESCRIPTION="Set of utilities such as crlf which converts files between UNIX and DOS newlines"
 HOMEPAGE="http://e.co.za/marius/"
 SRC_URI="http://e.co.za/marius/downloads/misc/fixDos-${PV}.tar.gz"
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="x86"
 IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 S=${WORKDIR}/fixDos-${PV}
 
@@ -30,6 +30,6 @@ src_compile() {
 	emake || die
 }
 
-src_install () {
+src_install() {
 	make INSTALLDIR=${D}/usr/bin install || die
 }
diff --git a/app-misc/fujiplay/fujiplay-1.33.ebuild b/app-misc/fujiplay/fujiplay-1.33.ebuild
index 14d2217cb205..dc8e21ffa38e 100644
--- a/app-misc/fujiplay/fujiplay-1.33.ebuild
+++ b/app-misc/fujiplay/fujiplay-1.33.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/fujiplay/fujiplay-1.33.ebuild,v 1.8 2004/06/24 22:11:50 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/fujiplay/fujiplay-1.33.ebuild,v 1.9 2004/06/28 03:35:27 vapier Exp $
 
 DESCRIPTION="Utility for Fujifilm/Leica digital cameras (via serial port)"
-SRC_URI="http://topo.math.u-psud.fr/~bousch/fujiplay.tgz"
 HOMEPAGE="http://topo.math.u-psud.fr/~bousch/fujiplay.html"
+SRC_URI="http://topo.math.u-psud.fr/~bousch/fujiplay.tgz"
 
+LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="x86"
 IUSE=""
-LICENSE="public-domain"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 RDEPEND=""
 
 S=${WORKDIR}
@@ -21,8 +21,7 @@ src_compile() {
 }
 
 src_install() {
-	into /usr
-	dobin fujiplay yycc2ppm
+	dobin fujiplay yycc2ppm || die
 	dodoc README fujiplay.lsm mx700-commands.html
 	emake all clean
 }
@@ -41,4 +40,3 @@ pkg_postrm() {
 	einfo "The symbolic link /dev/fujifilm was removed."
 	echo
 }
-
diff --git a/app-misc/gcal/gcal-3.01-r1.ebuild b/app-misc/gcal/gcal-3.01-r1.ebuild
index 2010fbfce9d3..fc68213ccfb5 100644
--- a/app-misc/gcal/gcal-3.01-r1.ebuild
+++ b/app-misc/gcal/gcal-3.01-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gcal/gcal-3.01-r1.ebuild,v 1.6 2004/06/24 22:12:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gcal/gcal-3.01-r1.ebuild,v 1.7 2004/06/28 03:36:10 vapier Exp $
 
 DESCRIPTION="The GNU Calendar - a replacement for cal"
 HOMEPAGE="http://www.gnu.org/software/gcal/gcal.html"
@@ -20,7 +20,7 @@ src_compile() {
 
 src_install() {
 	einstall || die
-	dodoc ABOUT-NLS ATTENTION BUGS COPYING DISCLAIM HISTORY \
+	dodoc ABOUT-NLS ATTENTION BUGS DISCLAIM HISTORY \
 		INSTALL LIMITATIONS MANIFEST NEWS README SYMBOLS THANKS TODO
 
 	# Need to fix up paths for scripts in misc directory
diff --git a/app-misc/gcal/gcal-3.01.ebuild b/app-misc/gcal/gcal-3.01.ebuild
index c427bd2b1086..f5b49e658343 100644
--- a/app-misc/gcal/gcal-3.01.ebuild
+++ b/app-misc/gcal/gcal-3.01.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gcal/gcal-3.01.ebuild,v 1.6 2004/06/24 22:12:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gcal/gcal-3.01.ebuild,v 1.7 2004/06/28 03:36:10 vapier Exp $
 
 DESCRIPTION="The GNU Calendar - a replacement for cal"
 HOMEPAGE="http://www.gnu.org/software/gcal/gcal.html"
@@ -20,7 +20,7 @@ src_compile() {
 
 src_install() {
 	einstall || die
-	dodoc ABOUT-NLS ATTENTION BUGS COPYING DISCLAIM HISTORY \
+	dodoc ABOUT-NLS ATTENTION BUGS DISCLAIM HISTORY \
 		INSTALL LIMITATIONS MANIFEST NEWS README SYMBOLS THANKS TODO
 
 	# Need to fix up paths for scripts in misc directory
diff --git a/app-misc/geekcode/geekcode-1.7.3.ebuild b/app-misc/geekcode/geekcode-1.7.3.ebuild
index c1d3e7bd0677..3c592d904b70 100644
--- a/app-misc/geekcode/geekcode-1.7.3.ebuild
+++ b/app-misc/geekcode/geekcode-1.7.3.ebuild
@@ -1,25 +1,23 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# Submitted by: Ferdy <ferdy@ferdyx.org>
-# $Header: /var/cvsroot/gentoo-x86/app-misc/geekcode/geekcode-1.7.3.ebuild,v 1.7 2004/06/28 01:29:48 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/geekcode/geekcode-1.7.3.ebuild,v 1.8 2004/06/28 03:36:27 vapier Exp $
 
 DESCRIPTION="Geek code generator"
 HOMEPAGE="http://geekcode.sourceforge.net/"
 SRC_URI="mirror://sourceforge/geekcode/${P}.tar.gz"
+
 LICENSE="GPL-2"
-KEYWORDS="x86 amd64 sparc ~mips"
 SLOT="0"
+KEYWORDS="x86 sparc ~mips amd64"
 IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_compile() {
 	emake CFLAGS="${CFLAGS}" || die "emake failed"
 }
 
 src_install() {
-	dodir /usr/bin
-	dobin geekcode
-
+	dobin geekcode || die
 	dodoc CHANGES README geekcode.txt
 }
diff --git a/app-misc/geekcode/geekcode-1.7.ebuild b/app-misc/geekcode/geekcode-1.7.ebuild
index 23fd3e6385f1..110c633756af 100644
--- a/app-misc/geekcode/geekcode-1.7.ebuild
+++ b/app-misc/geekcode/geekcode-1.7.ebuild
@@ -1,25 +1,23 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# Submitted by: Ferdy <ferdy@ferdyx.org>
-# $Header: /var/cvsroot/gentoo-x86/app-misc/geekcode/geekcode-1.7.ebuild,v 1.5 2004/06/24 22:12:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/geekcode/geekcode-1.7.ebuild,v 1.6 2004/06/28 03:36:27 vapier Exp $
 
 DESCRIPTION="Geek code generator"
 HOMEPAGE="http://geekcode.sourceforge.net/"
 SRC_URI="mirror://sourceforge/geekcode/${P}.tar.gz"
+
 LICENSE="GPL-2"
-KEYWORDS="x86"
 SLOT="0"
+KEYWORDS="x86"
 IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_compile() {
 	emake CFLAGS="${CFLAGS}" || die "emake failed"
 }
 
 src_install() {
-	dodir /usr/bin
 	dobin geekcode
-
 	dodoc CHANGES README geekcode.txt
 }
diff --git a/app-misc/gentoo/gentoo-0.11.45.ebuild b/app-misc/gentoo/gentoo-0.11.45.ebuild
index a892ea4edc6c..935ce516261b 100644
--- a/app-misc/gentoo/gentoo-0.11.45.ebuild
+++ b/app-misc/gentoo/gentoo-0.11.45.ebuild
@@ -1,19 +1,18 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gentoo/gentoo-0.11.45.ebuild,v 1.11 2004/06/24 22:12:44 agriffis Exp $
-
-IUSE="nls gnome"
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gentoo/gentoo-0.11.45.ebuild,v 1.12 2004/06/28 03:36:48 vapier Exp $
 
 DESCRIPTION="A modern GTK+ based filemanager for any WM"
-SRC_URI="mirror://sourceforge/gentoo/${P}.tar.gz"
 HOMEPAGE="http://www.obsession.se/gentoo/"
+SRC_URI="mirror://sourceforge/gentoo/${P}.tar.gz"
 
-DEPEND="=x11-libs/gtk+-1.2*"
-RDEPEND="nls? ( sys-devel/gettext )"
-
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc sparc alpha ~hppa amd64 ~ia64"
+IUSE="nls gnome"
+
+DEPEND="=x11-libs/gtk+-1.2*"
+RDEPEND="nls? ( sys-devel/gettext )"
 
 src_compile() {
 	econf \
@@ -34,7 +33,7 @@ src_install() {
 		doins ${FILESDIR}/gentoo.desktop
 	fi
 
-	dodoc AUTHORS BUGS CONFIG-CHANGES COPYING CREDITS ChangeLog INSTALL \
+	dodoc AUTHORS BUGS CONFIG-CHANGES CREDITS ChangeLog INSTALL \
 		NEWS ONEWS README* TODO
 	dodoc docs/FAQ docs/menus.txt
 
diff --git a/app-misc/gentoo/gentoo-0.11.46.ebuild b/app-misc/gentoo/gentoo-0.11.46.ebuild
index d108a8df4f75..cda99c0e9c6d 100644
--- a/app-misc/gentoo/gentoo-0.11.46.ebuild
+++ b/app-misc/gentoo/gentoo-0.11.46.ebuild
@@ -1,22 +1,20 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gentoo/gentoo-0.11.46.ebuild,v 1.6 2004/06/24 22:12:44 agriffis Exp $
-
-IUSE="nls gnome"
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gentoo/gentoo-0.11.46.ebuild,v 1.7 2004/06/28 03:36:48 vapier Exp $
 
 DESCRIPTION="A modern GTK+ based filemanager for any WM"
-SRC_URI="mirror://sourceforge/gentoo/${P}.tar.gz"
 HOMEPAGE="http://www.obsession.se/gentoo/"
+SRC_URI="mirror://sourceforge/gentoo/${P}.tar.gz"
 
-DEPEND="=x11-libs/gtk+-1.2*"
-RDEPEND="nls? ( sys-devel/gettext )"
-
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ~ppc sparc alpha ~hppa amd64 ~ia64"
+IUSE="nls gnome"
 
-src_compile() {
+DEPEND="=x11-libs/gtk+-1.2*"
+RDEPEND="nls? ( sys-devel/gettext )"
 
+src_compile() {
 	econf \
 		--sysconfdir=/etc/gentoo \
 		`use_enable nls` || die
@@ -35,7 +33,7 @@ src_install() {
 		doins ${FILESDIR}/gentoo.desktop
 	fi
 
-	dodoc AUTHORS BUGS CONFIG-CHANGES COPYING CREDITS ChangeLog INSTALL \
+	dodoc AUTHORS BUGS CONFIG-CHANGES CREDITS ChangeLog INSTALL \
 		NEWS ONEWS README* TODO
 	dodoc docs/FAQ docs/menus.txt
 
diff --git a/app-misc/gentoo/gentoo-0.11.48.ebuild b/app-misc/gentoo/gentoo-0.11.48.ebuild
index ba20bdc4df65..837e640801dc 100644
--- a/app-misc/gentoo/gentoo-0.11.48.ebuild
+++ b/app-misc/gentoo/gentoo-0.11.48.ebuild
@@ -1,22 +1,20 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gentoo/gentoo-0.11.48.ebuild,v 1.4 2004/06/24 22:12:44 agriffis Exp $
-
-IUSE="nls gnome"
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gentoo/gentoo-0.11.48.ebuild,v 1.5 2004/06/28 03:36:48 vapier Exp $
 
 DESCRIPTION="A modern GTK+ based filemanager for any WM"
-SRC_URI="mirror://sourceforge/gentoo/${P}.tar.gz"
 HOMEPAGE="http://www.obsession.se/gentoo/"
+SRC_URI="mirror://sourceforge/gentoo/${P}.tar.gz"
 
-DEPEND="=x11-libs/gtk+-1.2*"
-RDEPEND="nls? ( sys-devel/gettext )"
-
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ~ppc sparc ~alpha ~hppa ~amd64 ~ia64"
+IUSE="nls gnome"
 
-src_compile() {
+DEPEND="=x11-libs/gtk+-1.2*"
+RDEPEND="nls? ( sys-devel/gettext )"
 
+src_compile() {
 	econf \
 		--sysconfdir=/etc/gentoo \
 		`use_enable nls` || die
@@ -35,7 +33,7 @@ src_install() {
 		doins ${FILESDIR}/gentoo.desktop
 	fi
 
-	dodoc AUTHORS BUGS CONFIG-CHANGES COPYING CREDITS ChangeLog INSTALL \
+	dodoc AUTHORS BUGS CONFIG-CHANGES CREDITS ChangeLog INSTALL \
 		NEWS ONEWS README* TODO
 	dodoc docs/FAQ docs/menus.txt
 
diff --git a/app-misc/gentoo/gentoo-0.11.51.ebuild b/app-misc/gentoo/gentoo-0.11.51.ebuild
index 405406406f3b..3e6f36ae581d 100644
--- a/app-misc/gentoo/gentoo-0.11.51.ebuild
+++ b/app-misc/gentoo/gentoo-0.11.51.ebuild
@@ -1,22 +1,20 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gentoo/gentoo-0.11.51.ebuild,v 1.5 2004/06/25 23:25:55 kugelfang Exp $
-
-IUSE="nls gnome"
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gentoo/gentoo-0.11.51.ebuild,v 1.6 2004/06/28 03:36:48 vapier Exp $
 
 DESCRIPTION="A modern GTK+ based filemanager for any WM"
-SRC_URI="mirror://sourceforge/gentoo/${P}.tar.gz"
 HOMEPAGE="http://www.obsession.se/gentoo/"
+SRC_URI="mirror://sourceforge/gentoo/${P}.tar.gz"
 
-DEPEND="=x11-libs/gtk+-1.2*"
-RDEPEND="nls? ( sys-devel/gettext )"
-
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ~ppc sparc ~alpha ~hppa amd64 ~ia64"
+IUSE="nls gnome"
 
-src_compile() {
+DEPEND="=x11-libs/gtk+-1.2*"
+RDEPEND="nls? ( sys-devel/gettext )"
 
+src_compile() {
 	econf \
 		--sysconfdir=/etc/gentoo \
 		`use_enable nls` || die
@@ -35,7 +33,7 @@ src_install() {
 		doins ${FILESDIR}/gentoo.desktop
 	fi
 
-	dodoc AUTHORS BUGS CONFIG-CHANGES COPYING CREDITS ChangeLog INSTALL \
+	dodoc AUTHORS BUGS CONFIG-CHANGES CREDITS ChangeLog INSTALL \
 		NEWS ONEWS README* TODO
 	dodoc docs/FAQ docs/menus.txt
 
diff --git a/app-misc/gfontview/gfontview-0.5.0-r6.ebuild b/app-misc/gfontview/gfontview-0.5.0-r6.ebuild
index 2477214a4cd9..4c638ba2d8ec 100644
--- a/app-misc/gfontview/gfontview-0.5.0-r6.ebuild
+++ b/app-misc/gfontview/gfontview-0.5.0-r6.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gfontview/gfontview-0.5.0-r6.ebuild,v 1.5 2004/06/24 22:12:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gfontview/gfontview-0.5.0-r6.ebuild,v 1.6 2004/06/28 03:37:05 vapier Exp $
 
 inherit eutils
 
 DESCRIPTION="Fontviewer for PostScript Type 1 and TrueType"
-SRC_URI="mirror://sourceforge/gfontview/${P}.tar.gz"
 HOMEPAGE="http://gfontview.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gfontview/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc"
 IUSE="nls gnome"
 
@@ -35,7 +35,7 @@ src_compile() {
 
 src_install() {
 	einstall
-	dodoc AUTHORS COPYING ChangeLog NEWS README TODO
+	dodoc AUTHORS ChangeLog NEWS README TODO
 	insinto /usr/X11R6/include/X11/pixmaps/
 	doins error.xpm openhand.xpm font.xpm t1.xpm tt.xpm
 }
diff --git a/app-misc/git/git-4.3.20.ebuild b/app-misc/git/git-4.3.20.ebuild
index 4947dd9c0fcb..27e0322332d9 100644
--- a/app-misc/git/git-4.3.20.ebuild
+++ b/app-misc/git/git-4.3.20.ebuild
@@ -1,24 +1,19 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/git/git-4.3.20.ebuild,v 1.7 2004/06/24 22:13:07 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/git/git-4.3.20.ebuild,v 1.8 2004/06/28 03:37:22 vapier Exp $
 
 DESCRIPTION="GNU Interactive Tools - increase speed and efficiency of most daily task"
 HOMEPAGE="http://www.gnu.org/software/git/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86"
 IUSE=""
-SLOT="0"
 
 DEPEND="sys-devel/binutils"
 
-src_compile() {
-	econf || die "econf failed"
-	emake
-}
-
 src_install() {
-	einstall
-	dodoc AUTHORS COPYING INSTALL README NEWS VERSION STATUS
+	einstall || die
+	dodoc AUTHORS INSTALL README NEWS VERSION STATUS
 }
diff --git a/app-misc/glabels/glabels-1.93.3.ebuild b/app-misc/glabels/glabels-1.93.3.ebuild
index 7b558485dab3..49b611f388cb 100644
--- a/app-misc/glabels/glabels-1.93.3.ebuild
+++ b/app-misc/glabels/glabels-1.93.3.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/glabels/glabels-1.93.3.ebuild,v 1.5 2004/06/24 22:13:22 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/glabels/glabels-1.93.3.ebuild,v 1.6 2004/06/28 03:37:44 vapier Exp $
 
 inherit gnome2
 
 DESCRIPTION="Program for creating labels and business cards"
 HOMEPAGE="http://glabels.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
 
-KEYWORDS="x86 ~ppc ~sparc"
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
 SLOT="0"
+KEYWORDS="x86 ~ppc ~sparc"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.2
@@ -22,12 +22,11 @@ RDEPEND=">=dev-libs/glib-2.2
 	>=gnome-base/libgnomeprintui-2.2
 	>=gnome-base/libgnomecanvas-2.0.1
 	>=gnome-base/libglade-2.0.1"
-
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig
 	>=dev-util/intltool-0.21"
 
-DOCS="AUTHORS ChangeLog COPYING* README TODO"
+DOCS="AUTHORS ChangeLog README TODO"
 
 src_unpack() {
 	unpack ${A}
diff --git a/app-misc/glimpse/glimpse-4.15-r1.ebuild b/app-misc/glimpse/glimpse-4.15-r1.ebuild
index 6221f5fa2c33..983cd8836e76 100644
--- a/app-misc/glimpse/glimpse-4.15-r1.ebuild
+++ b/app-misc/glimpse/glimpse-4.15-r1.ebuild
@@ -1,23 +1,21 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/glimpse/glimpse-4.15-r1.ebuild,v 1.7 2004/06/24 22:13:43 agriffis Exp $
-
-IUSE=""
+# $Header: /var/cvsroot/gentoo-x86/app-misc/glimpse/glimpse-4.15-r1.ebuild,v 1.8 2004/06/28 03:38:22 vapier Exp $
 
 inherit eutils
 
 DESCRIPTION="A index/query system to search a large set of files quickly"
-SRC_URI="http://webglimpse.net/trial/${P}.tar.gz"
 HOMEPAGE="http://webglimpse.net/"
+SRC_URI="http://webglimpse.net/trial/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="BSD"
-KEYWORDS="x86 ~ppc ~mips amd64 sparc alpha ia64"
-RDEPEND="!dev-libs/tre
-	virtual/glibc"
-
-DEPEND="virtual/glibc"
+SLOT="0"
+KEYWORDS="x86 ~ppc sparc ~mips alpha amd64 ia64"
+IUSE=""
 
+RDEPEND="!dev-libs/tre
+	virtual/libc"
+DEPEND="virtual/libc"
 
 src_compile() {
 	epatch ${FILESDIR}/${PV}-errno.patch
diff --git a/app-misc/glimpse/glimpse-4.17.4.ebuild b/app-misc/glimpse/glimpse-4.17.4.ebuild
index e19223a0b713..ec39bd2cf743 100644
--- a/app-misc/glimpse/glimpse-4.17.4.ebuild
+++ b/app-misc/glimpse/glimpse-4.17.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/glimpse/glimpse-4.17.4.ebuild,v 1.6 2004/06/24 22:13:43 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/glimpse/glimpse-4.17.4.ebuild,v 1.7 2004/06/28 03:38:22 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -12,10 +12,10 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="x86 ppc sparc mips alpha amd64 ia64"
 IUSE="static"
-RDEPEND="!dev-libs/tre
-	virtual/glibc"
 
-DEPEND="virtual/glibc"
+RDEPEND="!dev-libs/tre
+	virtual/libc"
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
diff --git a/app-misc/gramps/gramps-0.99.ebuild b/app-misc/gramps/gramps-0.99.ebuild
index b8fd31339e58..4303e79a05eb 100644
--- a/app-misc/gramps/gramps-0.99.ebuild
+++ b/app-misc/gramps/gramps-0.99.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/gramps-0.99.ebuild,v 1.2 2004/06/24 22:14:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/gramps-0.99.ebuild,v 1.3 2004/06/28 03:39:03 vapier Exp $
 
 inherit gnome2
 
-IUSE=""
 DESCRIPTION="Genealogical Research and Analysis Management Programming System"
-SRC_URI="mirror://sourceforge/gramps/${P}.tar.gz"
 HOMEPAGE="http://gramps.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gramps/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~x86"
+IUSE=""
 
 RDEPEND=">=dev-lang/python-2.2
 	>=dev-python/pygtk-1.99.14
@@ -20,14 +20,14 @@ RDEPEND=">=dev-lang/python-2.2
 	>=dev-python/pyxml-0.7.1
 	>=dev-python/Imaging-1.1.3
 	>=dev-python/reportlab-1.11"
-
 DEPEND="${RDEPEND}
 	dev-lang/swig
 	dev-util/pkgconfig
 	app-text/scrollkeeper"
 
-DOCS="COPYING NEWS README TODO"
+DOCS="NEWS README TODO"
 MAKEOPTS="${MAKEOPTS} -j1"
+
 pkg_setup() {
 	if ! python -c "import gtk.glade" 2>&1 > /dev/null ; then
 		eerror "You need to install pygtk with libglade support. Try:"
diff --git a/app-misc/gramps/gramps-1.0.0.ebuild b/app-misc/gramps/gramps-1.0.0.ebuild
index 8befb3cd14f2..8aad9798ec03 100644
--- a/app-misc/gramps/gramps-1.0.0.ebuild
+++ b/app-misc/gramps/gramps-1.0.0.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/gramps-1.0.0.ebuild,v 1.3 2004/06/24 22:14:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/gramps-1.0.0.ebuild,v 1.4 2004/06/28 03:39:03 vapier Exp $
 
 inherit gnome2
 
-IUSE=""
 DESCRIPTION="Genealogical Research and Analysis Management Programming System"
-SRC_URI="mirror://sourceforge/gramps/${P}.tar.gz"
 HOMEPAGE="http://gramps.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gramps/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~x86 ~sparc"
+IUSE=""
 
 RDEPEND=">=dev-lang/python-2.2
 	>=dev-python/pygtk-1.99.14
@@ -20,14 +20,14 @@ RDEPEND=">=dev-lang/python-2.2
 	>=dev-python/pyxml-0.7.1
 	>=dev-python/Imaging-1.1.3
 	>=dev-python/reportlab-1.11"
-
 DEPEND="${RDEPEND}
 	dev-lang/swig
 	dev-util/pkgconfig
 	app-text/scrollkeeper"
 
-DOCS="COPYING NEWS README TODO"
+DOCS="NEWS README TODO"
 MAKEOPTS="${MAKEOPTS} -j1"
+
 pkg_setup() {
 	if ! python -c "import gtk.glade" 2>&1 > /dev/null ; then
 		eerror "You need to install pygtk with libglade support. Try:"
diff --git a/app-misc/gramps/gramps-1.0.1.ebuild b/app-misc/gramps/gramps-1.0.1.ebuild
index eb8b722f2a00..75ede08b34ee 100644
--- a/app-misc/gramps/gramps-1.0.1.ebuild
+++ b/app-misc/gramps/gramps-1.0.1.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/gramps-1.0.1.ebuild,v 1.4 2004/06/26 21:11:49 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/gramps-1.0.1.ebuild,v 1.5 2004/06/28 03:39:03 vapier Exp $
 
 inherit gnome2 virtualx
 
-IUSE=""
 DESCRIPTION="Genealogical Research and Analysis Management Programming System"
-SRC_URI="mirror://sourceforge/gramps/${P}.tar.gz"
 HOMEPAGE="http://gramps.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gramps/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+IUSE=""
 
 RDEPEND=">=dev-lang/python-2.2
 	>=dev-python/pygtk-1.99.14
@@ -26,7 +26,7 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	app-text/scrollkeeper"
 
-DOCS="COPYING NEWS README TODO"
+DOCS="NEWS README TODO"
 MAKEOPTS="${MAKEOPTS} -j1"
 
 pkg_setup() {
diff --git a/app-misc/gtktalog/gtktalog-1.0.1.ebuild b/app-misc/gtktalog/gtktalog-1.0.1.ebuild
index 8b544c769f79..cdc5ffaa9f85 100644
--- a/app-misc/gtktalog/gtktalog-1.0.1.ebuild
+++ b/app-misc/gtktalog/gtktalog-1.0.1.ebuild
@@ -1,30 +1,23 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gtktalog/gtktalog-1.0.1.ebuild,v 1.5 2004/06/24 22:14:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gtktalog/gtktalog-1.0.1.ebuild,v 1.6 2004/06/28 03:39:40 vapier Exp $
 
-DESCRIPTION="The GTK disk catalog."
-SRC_URI="http://savannah.nongnu.org/download/${PN}/${PN}.pkg/${PV}/${P}.tar.bz2"
+DESCRIPTION="The GTK disk catalog"
 HOMEPAGE="http://www.freesoftware.fsf.org/gtktalog"
+SRC_URI="http://savannah.nongnu.org/download/${PN}/${PN}.pkg/${PV}/${P}.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86"
 IUSE="nls"
 
 RDEPEND="=x11-libs/gtk+-1.2*
 	>=gnome-base/gnome-libs-1.4.1.2-r1
 	>=sys-libs/zlib-1.1.4"
-
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
 src_compile() {
-	local myconf
-
-	use nls \
-		&& myconf="--enable-nls" \
-		|| myconf="--disable-nls"
-
 	econf \
 		--enable-htmltitle \
 		--enable-mp3info \
@@ -34,13 +27,12 @@ src_compile() {
 		--enable-ogginfo \
 		--enable-catalog2 \
 		--enable-catalog3 \
-		${myconf} || die "econf failed"
-
+		`use_enable nls` \
+		|| die "econf failed"
 	emake || die
 }
 
 src_install() {
-	einstall
-
-	dodoc AUTHORS BUGS COPYING ChangeLog NEWS README TODO
+	einstall || die
+	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
 }
diff --git a/app-misc/gtktalog/gtktalog-1.0.2.ebuild b/app-misc/gtktalog/gtktalog-1.0.2.ebuild
index 96d8f86f9182..d7b45df86c85 100644
--- a/app-misc/gtktalog/gtktalog-1.0.2.ebuild
+++ b/app-misc/gtktalog/gtktalog-1.0.2.ebuild
@@ -1,30 +1,23 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gtktalog/gtktalog-1.0.2.ebuild,v 1.4 2004/06/24 22:14:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gtktalog/gtktalog-1.0.2.ebuild,v 1.5 2004/06/28 03:39:40 vapier Exp $
 
-DESCRIPTION="The GTK disk catalog."
-SRC_URI="http://savannah.nongnu.org/download/${PN}/${PN}.pkg/${PV}/${P}.tar.bz2"
+DESCRIPTION="The GTK disk catalog"
 HOMEPAGE="http://www.freesoftware.fsf.org/gtktalog"
+SRC_URI="http://savannah.nongnu.org/download/${PN}/${PN}.pkg/${PV}/${P}.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86"
 IUSE="nls"
 
 RDEPEND="=x11-libs/gtk+-1.2*
 	>=gnome-base/gnome-libs-1.4.1.2-r1
 	>=sys-libs/zlib-1.1.4"
-
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
 src_compile() {
-	local myconf
-
-	use nls \
-		&& myconf="--enable-nls" \
-		|| myconf="--disable-nls"
-
 	econf \
 		--enable-htmltitle \
 		--enable-mp3info \
@@ -34,13 +27,12 @@ src_compile() {
 		--enable-ogginfo \
 		--enable-catalog2 \
 		--enable-catalog3 \
-		${myconf} || die "econf failed"
-
+		`use_enable nls` \
+		|| die "econf failed"
 	emake || die
 }
 
 src_install() {
-	einstall
-
-	dodoc AUTHORS BUGS COPYING ChangeLog NEWS README TODO
+	einstall || die
+	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
 }
diff --git a/app-misc/gtktalog/gtktalog-1.0.3.ebuild b/app-misc/gtktalog/gtktalog-1.0.3.ebuild
index 5c418c858d3c..0f912f010e5b 100644
--- a/app-misc/gtktalog/gtktalog-1.0.3.ebuild
+++ b/app-misc/gtktalog/gtktalog-1.0.3.ebuild
@@ -1,30 +1,23 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gtktalog/gtktalog-1.0.3.ebuild,v 1.4 2004/06/24 22:14:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gtktalog/gtktalog-1.0.3.ebuild,v 1.5 2004/06/28 03:39:40 vapier Exp $
 
-DESCRIPTION="The GTK disk catalog."
-SRC_URI="http://savannah.nongnu.org/download/${PN}/${PN}.pkg/${PV}/${P}.tar.bz2"
+DESCRIPTION="The GTK disk catalog"
 HOMEPAGE="http://www.freesoftware.fsf.org/gtktalog"
+SRC_URI="http://savannah.nongnu.org/download/${PN}/${PN}.pkg/${PV}/${P}.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86"
 IUSE="nls"
 
 RDEPEND="=x11-libs/gtk+-1.2*
 	>=gnome-base/gnome-libs-1.4.1.2-r1
 	>=sys-libs/zlib-1.1.4"
-
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
 src_compile() {
-	local myconf
-
-	use nls \
-		&& myconf="--enable-nls" \
-		|| myconf="--disable-nls"
-
 	econf \
 		--enable-htmltitle \
 		--enable-mp3info \
@@ -34,13 +27,12 @@ src_compile() {
 		--enable-ogginfo \
 		--enable-catalog2 \
 		--enable-catalog3 \
-		${myconf} || die "econf failed"
-
+		`use_enable nls` \
+		|| die "econf failed"
 	emake || die
 }
 
 src_install() {
-	einstall
-
-	dodoc AUTHORS BUGS COPYING ChangeLog NEWS README TODO
+	einstall || die
+	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
 }
diff --git a/app-misc/gtypist/gtypist-2.5.ebuild b/app-misc/gtypist/gtypist-2.5.ebuild
index 91a1614e19f8..440c138dae87 100644
--- a/app-misc/gtypist/gtypist-2.5.ebuild
+++ b/app-misc/gtypist/gtypist-2.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gtypist/gtypist-2.5.ebuild,v 1.13 2004/06/24 22:15:11 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gtypist/gtypist-2.5.ebuild,v 1.14 2004/06/28 03:40:06 vapier Exp $
 
 DESCRIPTION="universal typing tutor"
-SRC_URI="ftp://ftp.gnu.org/gnu/gtypist/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/gtypist/gtypist.html"
+SRC_URI="ftp://ftp.gnu.org/gnu/gtypist/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86"
 IUSE="nls"
 
@@ -17,12 +17,11 @@ src_compile() {
 	# gtypist also produces some Emacs/XEmacs editing modes if
 	# emacs/xemacs is present. if emacs/xemacs is not present then
 	# these emacs modes are not compiled or installed.
-
 	econf `use_enable nls` || die
 	emake || die
 }
 
 src_install() {
 	make DESTDIR=${D} install || die
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README TODO THANKS
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO THANKS
 }
diff --git a/app-misc/gtypist/gtypist-2.6.2.ebuild b/app-misc/gtypist/gtypist-2.6.2.ebuild
index f2842dd8bfc9..04620c696d4b 100644
--- a/app-misc/gtypist/gtypist-2.6.2.ebuild
+++ b/app-misc/gtypist/gtypist-2.6.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gtypist/gtypist-2.6.2.ebuild,v 1.7 2004/06/24 22:15:11 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gtypist/gtypist-2.6.2.ebuild,v 1.8 2004/06/28 03:40:06 vapier Exp $
 
 DESCRIPTION="universal typing tutor"
-SRC_URI="mirror://gnu/gtypist/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/gtypist/gtypist.html"
+SRC_URI="mirror://gnu/gtypist/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86"
 IUSE="nls"
 
@@ -23,5 +23,5 @@ src_compile() {
 
 src_install() {
 	make DESTDIR=${D} install || die
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README TODO THANKS
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO THANKS
 }
diff --git a/app-misc/gtypist/gtypist-2.7.ebuild b/app-misc/gtypist/gtypist-2.7.ebuild
index 4289dd6d4649..7285d9e86fa3 100644
--- a/app-misc/gtypist/gtypist-2.7.ebuild
+++ b/app-misc/gtypist/gtypist-2.7.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gtypist/gtypist-2.7.ebuild,v 1.4 2004/06/24 22:15:11 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gtypist/gtypist-2.7.ebuild,v 1.5 2004/06/28 03:40:06 vapier Exp $
 
 DESCRIPTION="universal typing tutor"
-SRC_URI="mirror://gnu/gtypist/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/gtypist/gtypist.html"
+SRC_URI="mirror://gnu/gtypist/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86"
 IUSE="nls"
 
@@ -23,5 +23,5 @@ src_compile() {
 
 src_install() {
 	make DESTDIR=${D} install || die
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README TODO THANKS
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO THANKS
 }
diff --git a/app-misc/i810switch/i810switch-0.6.2.ebuild b/app-misc/i810switch/i810switch-0.6.2.ebuild
index 138bf2733929..54ad01761271 100644
--- a/app-misc/i810switch/i810switch-0.6.2.ebuild
+++ b/app-misc/i810switch/i810switch-0.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/i810switch/i810switch-0.6.2.ebuild,v 1.4 2004/06/24 22:15:43 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/i810switch/i810switch-0.6.2.ebuild,v 1.5 2004/06/28 03:40:49 vapier Exp $
 
 DESCRIPTION="A utility for switching the LCD and external VGA displays on and off"
 HOMEPAGE="http://vorlon.ces.cwru.edu/~ames/i810switch/"
@@ -8,18 +8,17 @@ SRC_URI="http://vorlon.ces.cwru.edu/~ames/i810switch/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-alpha -hppa -mips -sparc x86"
+KEYWORDS="-* x86"
 IUSE=""
-DEPEND="virtual/glibc"
+
+DEPEND="virtual/libc"
 RDEPEND="sys-apps/pciutils"
 
-src_compile()
-{
+src_compile() {
 	emake || die "compile failed"
 }
 
-src_install()
-{
+src_install() {
 	make DESTDIR=${D} install || die "install failed"
 	dodoc AUTHORS ChangeLog README TODO
 }
diff --git a/app-misc/ifp-line/ifp-line-0.2.3.ebuild b/app-misc/ifp-line/ifp-line-0.2.3.ebuild
index 8c51c1a66650..20d8a3adfc8c 100644
--- a/app-misc/ifp-line/ifp-line-0.2.3.ebuild
+++ b/app-misc/ifp-line/ifp-line-0.2.3.ebuild
@@ -1,17 +1,15 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ifp-line/ifp-line-0.2.3.ebuild,v 1.4 2004/06/24 22:15:54 agriffis Exp $
-
-IUSE=""
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ifp-line/ifp-line-0.2.3.ebuild,v 1.5 2004/06/28 03:41:37 vapier Exp $
 
 DESCRIPTION="iRiver iFP open-source driver"
 HOMEPAGE="http://ifp-driver.sourceforge.net/"
 SRC_URI="mirror://sourceforge/ifp-driver/${P}.tar.gz"
-RESTRICT="nomirror"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86" # User-submitted contained: "~sparc ~amd64 ~ppc"
+SLOT="0"
+KEYWORDS="x86"
+IUSE=""
 
 DEPEND="dev-libs/libusb"
 
@@ -20,13 +18,11 @@ src_compile() {
 }
 
 src_install() {
-	dobin ifp
-	dodoc COPYING NEWS README TIPS
+	dobin ifp || die
+	dodoc NEWS README TIPS
 }
 
 pkg_postinst() {
-	ewarn
 	ewarn "to use ifp-line as non-root user, please follow"
 	ewarn "the instructions in /usr/share/doc/${P}/TIPS.gz"
-	ewarn
 }
diff --git a/app-misc/ithought/ithought-0.0.5-r1.ebuild b/app-misc/ithought/ithought-0.0.5-r1.ebuild
index 66c8b9f3f964..c43d306b4c25 100644
--- a/app-misc/ithought/ithought-0.0.5-r1.ebuild
+++ b/app-misc/ithought/ithought-0.0.5-r1.ebuild
@@ -1,29 +1,24 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ithought/ithought-0.0.5-r1.ebuild,v 1.16 2004/06/24 22:16:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ithought/ithought-0.0.5-r1.ebuild,v 1.17 2004/06/28 03:42:29 vapier Exp $
 
 #emerge doesn't yet support things like a5
 
 MY_P=${P/0.0./a}
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="An internet-aware personal thought manager"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 HOMEPAGE="http://ithought.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86"
 IUSE=""
 
 DEPEND="=x11-libs/gtk+-1.2*
 	dev-libs/libxml2"
 
-src_compile() {
-	econf || die "econf failed"
-	emake || die
-}
-
 src_install() {
 	make DESTDIR=${D} install || die
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
 }
diff --git a/app-misc/jail/jail-1.9-r1.ebuild b/app-misc/jail/jail-1.9-r1.ebuild
index 68c052afbd7d..2bde1ed4ded2 100644
--- a/app-misc/jail/jail-1.9-r1.ebuild
+++ b/app-misc/jail/jail-1.9-r1.ebuild
@@ -1,20 +1,20 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/jail/jail-1.9-r1.ebuild,v 1.11 2004/06/24 22:16:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/jail/jail-1.9-r1.ebuild,v 1.12 2004/06/28 03:43:18 vapier Exp $
 
 inherit eutils
 
 S="${WORKDIR}/${PN}_1-9_stable"
 DESCRIPTION="Jail Chroot Project is a tool that builds a chrooted environment and automagically configures and builds all the required files, directories and libraries"
-SRC_URI="mirror://sourceforge/jail/${PN}_${PV}.tar.gz"
 HOMEPAGE="http://www.jmcresearch.com/projects/jail/"
-RESTRICT="nomirror"
-IUSE=""
+SRC_URI="mirror://sourceforge/jail/${PN}_${PV}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 -ppc -sparc"
+KEYWORDS="x86"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 RDEPEND="dev-lang/perl
 	dev-util/strace"
 
diff --git a/app-misc/jbidwatcher/jbidwatcher-0.9.3_pre1.ebuild b/app-misc/jbidwatcher/jbidwatcher-0.9.3_pre1.ebuild
index a1622aa0dfac..20a5d2e57c6a 100644
--- a/app-misc/jbidwatcher/jbidwatcher-0.9.3_pre1.ebuild
+++ b/app-misc/jbidwatcher/jbidwatcher-0.9.3_pre1.ebuild
@@ -1,24 +1,26 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/jbidwatcher/jbidwatcher-0.9.3_pre1.ebuild,v 1.3 2004/06/24 22:16:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/jbidwatcher/jbidwatcher-0.9.3_pre1.ebuild,v 1.4 2004/06/28 03:44:02 vapier Exp $
 
 inherit java-pkg
 
 DESCRIPTION="Ebay Bidder Tools for Sniping"
 HOMEPAGE="http://jbidwatcher.sf.net/"
 SRC_URI="mirror://sourceforge/jbidwatcher/${P/_/}.tar.gz"
+
 LICENSE="LGPL-2.1"
-IUSE="jikes"
 SLOT="0"
 KEYWORDS="~x86"
+IUSE="jikes"
+
 DEPEND=">=virtual/jdk-1.4
-		dev-java/ant
-		jikes? ( dev-java/jikes )"
+	dev-java/ant
+	jikes? ( dev-java/jikes )"
 RDEPEND=">=virtual/jre-1.4"
 
 S=${WORKDIR}/${P/_/}
 
-src_compile(){
+src_compile() {
 	sed -i 's:${user.home}/.jbidwatcher:.:' build.xml
 	sed -i 's:jikes:modern:' build.xml
 
diff --git a/app-misc/jbidwatcher/jbidwatcher-0.9.3_pre2.ebuild b/app-misc/jbidwatcher/jbidwatcher-0.9.3_pre2.ebuild
index 0b4bda87d1c8..549b8f4bbde0 100644
--- a/app-misc/jbidwatcher/jbidwatcher-0.9.3_pre2.ebuild
+++ b/app-misc/jbidwatcher/jbidwatcher-0.9.3_pre2.ebuild
@@ -1,24 +1,26 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/jbidwatcher/jbidwatcher-0.9.3_pre2.ebuild,v 1.2 2004/06/24 22:16:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/jbidwatcher/jbidwatcher-0.9.3_pre2.ebuild,v 1.3 2004/06/28 03:44:02 vapier Exp $
 
 inherit java-pkg
 
 DESCRIPTION="Ebay Bidder Tools for Sniping"
 HOMEPAGE="http://jbidwatcher.sf.net/"
 SRC_URI="mirror://sourceforge/jbidwatcher/${P/_/}.tar.gz"
+
 LICENSE="LGPL-2.1"
-IUSE="jikes"
 SLOT="0"
 KEYWORDS="~x86"
+IUSE="jikes"
+
 DEPEND=">=virtual/jdk-1.4
-		dev-java/ant
-		jikes? ( dev-java/jikes )"
+	dev-java/ant
+	jikes? ( dev-java/jikes )"
 RDEPEND=">=virtual/jre-1.4"
 
 S=${WORKDIR}/${P/_/}
 
-src_compile(){
+src_compile() {
 	sed -i 's:${user.home}/.jbidwatcher:.:' build.xml
 	sed -i 's:jikes:modern:' build.xml
 	# Fix bad build.xml
diff --git a/app-misc/jive/jive-1.1.ebuild b/app-misc/jive/jive-1.1.ebuild
index c4828ec99057..d04e2c36d1e5 100644
--- a/app-misc/jive/jive-1.1.ebuild
+++ b/app-misc/jive/jive-1.1.ebuild
@@ -1,25 +1,26 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/jive/jive-1.1.ebuild,v 1.6 2004/06/24 22:17:10 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/jive/jive-1.1.ebuild,v 1.7 2004/06/28 03:45:42 vapier Exp $
 
 DESCRIPTION="Filter that converts English text to Jive, by Adam Douglas"
 HOMEPAGE="http://dev.gentoo.org/~brad/"
 SRC_URI="http://dev.gentoo.org/~brad/${P}.tar.gz"
+
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="x86 ppc ~sparc"
 IUSE=""
-DEPEND="virtual/glibc"
-#RDEPEND=""
+
+DEPEND="virtual/libc"
 
 S=${WORKDIR}/${PN}
 
 src_compile() {
-	emake
+	emake || die
 }
 
 src_install() {
-	dobin jive
+	dobin jive || die
 	doman jive.1
 	dodoc README POSTER
 }