dont install stupid COPYING files among other things

76 files changed, 440 insertions, 512 deletions

diff --git a/app-admin/aide/aide-0.8.ebuild b/app-admin/aide/aide-0.8.ebuild
index 8af09ad7d644..57c7422e5b32 100644
--- a/app-admin/aide/aide-0.8.ebuild
+++ b/app-admin/aide/aide-0.8.ebuild
@@ -1,17 +1,15 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/aide/aide-0.8.ebuild,v 1.20 2004/03/29 15:10:57 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/aide/aide-0.8.ebuild,v 1.21 2004/05/31 19:21:32 vapier Exp $
 
-IUSE="nls postgres"
-
-S=${WORKDIR}/${P}
 DESCRIPTION="AIDE (Advanced Intrusion Detection Environment) is a free replacement for Tripwire"
 HOMEPAGE="http://www.cs.tut.fi/~rammer/aide.html"
 SRC_URI="http://www.cs.tut.fi/~rammer/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc -sparc"
+IUSE="nls postgres"
 
 DEPEND="app-arch/gzip
 	sys-devel/bison
@@ -19,11 +17,9 @@ DEPEND="app-arch/gzip
 	dev-libs/libgcrypt
 	app-crypt/mhash
 	postgres? ( dev-db/postgresql )"
-
 RDEPEND=""
 
 src_compile() {
-
 	local myconf
 	use postgres && myconf="${myconf} --with-psql"
 	use nls &&  myconf="${myconf} --with-locale"
@@ -39,13 +35,11 @@ src_compile() {
 }
 
 src_install() {
-
 	make prefix=${D}/usr mandir=${D}/usr/share/man  install || die
 
 	dodir /etc/aide
 	cp doc/aide.conf ${D}/etc/aide
 
-	dodoc AUTHORS COPYING INSTALL NEWS README
+	dodoc AUTHORS INSTALL NEWS README
 	dohtml doc/manual.html
-
 }
diff --git a/app-admin/apg/apg-2.1.0.ebuild b/app-admin/apg/apg-2.1.0.ebuild
index b04baab87b48..fbc3ddd9fb42 100644
--- a/app-admin/apg/apg-2.1.0.ebuild
+++ b/app-admin/apg/apg-2.1.0.ebuild
@@ -1,17 +1,17 @@
-# 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/app-admin/apg/apg-2.1.0.ebuild,v 1.3 2003/06/29 15:24:07 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apg/apg-2.1.0.ebuild,v 1.4 2004/05/31 19:21:32 vapier Exp $
 
 DESCRIPTION="Another Password Generator"
-SRC_URI="http://www.adel.nursat.kz/apg/download/${P}.tar.gz"
 HOMEPAGE="http://www.adel.nursat.kz/apg/"
+SRC_URI="http://www.adel.nursat.kz/apg/download/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="as-is"
+SLOT="0"
 KEYWORDS="x86 ppc"
 IUSE=""
-RDEPEND=""
 
+RDEPEND=""
 DEPEND="virtual/glibc"
 
 src_compile() {
@@ -23,7 +23,7 @@ src_compile() {
 
 src_install() {
 	exeinto /usr/bin ; doexe apg apgbfm
-	dodoc CHANGES COPYING INSTALL README THANKS TODO
+	dodoc CHANGES INSTALL README THANKS TODO
 	cd ${S}/doc
 	doman man/apg.1
 	dodoc APG_TIPS pronun.txt rfc0972.txt  rfc1750.txt
diff --git a/app-admin/apg/apg-2.2.3.ebuild b/app-admin/apg/apg-2.2.3.ebuild
index cc95dc45de84..f16afd3de13d 100644
--- a/app-admin/apg/apg-2.2.3.ebuild
+++ b/app-admin/apg/apg-2.2.3.ebuild
@@ -1,13 +1,13 @@
-# 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/app-admin/apg/apg-2.2.3.ebuild,v 1.2 2003/12/04 00:30:25 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apg/apg-2.2.3.ebuild,v 1.3 2004/05/31 19:21:32 vapier Exp $
 
 DESCRIPTION="Another Password Generator"
-SRC_URI="http://www.adel.nursat.kz/apg/download/${P}.tar.gz"
 HOMEPAGE="http://www.adel.nursat.kz/apg/"
+SRC_URI="http://www.adel.nursat.kz/apg/download/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="as-is"
+SLOT="0"
 KEYWORDS="x86 ~ppc ~sparc"
 IUSE=""
 
@@ -22,7 +22,7 @@ src_compile() {
 
 src_install() {
 	exeinto /usr/bin ; doexe apg apgbfm
-	dodoc CHANGES COPYING INSTALL README THANKS TODO
+	dodoc CHANGES INSTALL README THANKS TODO
 	cd ${S}/doc
 	doman man/apg.1
 	dodoc APG_TIPS pronun.txt rfc0972.txt rfc1750.txt
diff --git a/app-admin/apg/apg-2.3.0b.ebuild b/app-admin/apg/apg-2.3.0b.ebuild
index 3cd6532236d2..bb732b68e25a 100644
--- a/app-admin/apg/apg-2.3.0b.ebuild
+++ b/app-admin/apg/apg-2.3.0b.ebuild
@@ -1,17 +1,18 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apg/apg-2.3.0b.ebuild,v 1.5 2004/02/29 19:44:42 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apg/apg-2.3.0b.ebuild,v 1.6 2004/05/31 19:21:32 vapier Exp $
 
 DESCRIPTION="Another Password Generator"
-SRC_URI="http://www.adel.nursat.kz/apg/download/${P}.tar.gz"
 HOMEPAGE="http://www.adel.nursat.kz/apg/"
+SRC_URI="http://www.adel.nursat.kz/apg/download/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="as-is"
-KEYWORDS="~x86 ~ppc amd64 ~sparc"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc amd64"
 IUSE=""
 
 DEPEND="virtual/glibc"
+
 src_unpack() {
 	unpack ${A}
 	chmod -R +w ${S}
@@ -27,7 +28,7 @@ src_compile() {
 
 src_install() {
 	dobin apg apgbfm bfconvert/bfconvert
-	dodoc CHANGES COPYING INSTALL README THANKS TODO
+	dodoc CHANGES INSTALL README THANKS TODO
 	cd ${S}/doc
 	doman man/apg.1 man/apgbfm.1
 	dodoc APG_TIPS pronun.txt rfc0972.txt rfc1750.txt
diff --git a/app-admin/bacula/bacula-1.29.ebuild b/app-admin/bacula/bacula-1.29.ebuild
index a98299a0b635..6ba80e3c20d2 100644
--- a/app-admin/bacula/bacula-1.29.ebuild
+++ b/app-admin/bacula/bacula-1.29.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/bacula/bacula-1.29.ebuild,v 1.10 2004/02/11 23:38:03 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bacula/bacula-1.29.ebuild,v 1.11 2004/05/31 19:21:32 vapier Exp $
 
 DESCRIPTION="featureful client/server network backup suite"
 HOMEPAGE="http://www.bacula.org/"
 SRC_URI="mirror://sourceforge/bacula/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc"
 SLOT="0"
+KEYWORDS="x86 ~ppc"
 IUSE="readline tcpd ssl gnome mysql sqlite X static"
 
 #theres a local sqlite use flag. use it -OR- mysql, not both.
@@ -22,7 +22,8 @@ DEPEND=">=sys-libs/zlib-1.1.4
 	mysql? >=dev-db/mysql-3.23
 	sqlite? >=dev-db/sqlite-2.7
 	X? virtual/x11"
-RDEPEND="${DEPEND} sys-apps/mtx app-arch/mt-st"
+RDEPEND="${DEPEND}
+	sys-apps/mtx app-arch/mt-st"
 
 src_compile() {
 	local myconf
@@ -76,8 +77,7 @@ src_install() {
 	rm -rf ${D}/var #empty dir
 
 	dosbin src/console/console
-	dodoc ABOUT-NLS COPYING ChangeLog CheckList INSTALL \
-		README ReleaseNotes kernstodo doc/bacula.pdf
+	dodoc ChangeLog CheckList INSTALL README ReleaseNotes kernstodo doc/bacula.pdf
 	cp -a examples ${D}/usr/share/doc/${PF}
 	chown -R root:root ${D}/usr/share/doc/${PF} #hrmph :\
 	dohtml -r doc/html-manual doc/home-page
diff --git a/app-admin/bacula/bacula-1.31.ebuild b/app-admin/bacula/bacula-1.31.ebuild
index c7f005f14e08..a31bafbd0bbc 100644
--- a/app-admin/bacula/bacula-1.31.ebuild
+++ b/app-admin/bacula/bacula-1.31.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/bacula/bacula-1.31.ebuild,v 1.8 2004/02/03 02:18:48 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bacula/bacula-1.31.ebuild,v 1.9 2004/05/31 19:21:32 vapier Exp $
 
 NEWP=${P}a
 S=${WORKDIR}/${NEWP}
 DESCRIPTION="featureful client/server network backup suite"
 HOMEPAGE="http://www.bacula.org/"
 SRC_URI="mirror://sourceforge/bacula/${NEWP}.tar.gz
-		http://download.sourceforge.net/bacula/${NEWP}.tar.gz"
+	http://download.sourceforge.net/bacula/${NEWP}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -83,7 +83,7 @@ src_install() {
 	make DESTDIR=${D} install || die
 	rm -rf ${D}/var #empty dir
 
-	dodoc ABOUT-NLS COPYING ChangeLog CheckList INSTALL \
+	dodoc ChangeLog CheckList INSTALL \
 		README ReleaseNotes kernstodo doc/bacula.pdf
 	cp -a examples ${D}/usr/share/doc/${PF}
 	chown -R root:root ${D}/usr/share/doc/${PF} #hrmph :\
diff --git a/app-admin/bacula/bacula-1.32f-r5.ebuild b/app-admin/bacula/bacula-1.32f-r5.ebuild
index 9666ed6d29b5..63965434b4a4 100644
--- a/app-admin/bacula/bacula-1.32f-r5.ebuild
+++ b/app-admin/bacula/bacula-1.32f-r5.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/app-admin/bacula/bacula-1.32f-r5.ebuild,v 1.4 2004/04/09 16:39:27 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bacula/bacula-1.32f-r5.ebuild,v 1.5 2004/05/31 19:21:32 vapier Exp $
 
 MY_P="bacula-1.32f-5"
 S="${WORKDIR}/${MY_P}"
@@ -118,7 +118,7 @@ src_install() {
 
 	rm -rf ${D}/var #empty dir
 
-	for a in ${S}/{ABOUT-NLS,COPYING,Changelog,CheckList,INSTALL \
+	for a in ${S}/{Changelog,CheckList,INSTALL \
 			README,ReleaseNotes,kernstodo,doc/bacula.pdf}
 	do
 		dodoc $a
diff --git a/app-admin/bacula/bacula-1.32f.ebuild b/app-admin/bacula/bacula-1.32f.ebuild
index 087574ee6821..183a984519a9 100644
--- a/app-admin/bacula/bacula-1.32f.ebuild
+++ b/app-admin/bacula/bacula-1.32f.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/app-admin/bacula/bacula-1.32f.ebuild,v 1.8 2004/04/14 07:27:00 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bacula/bacula-1.32f.ebuild,v 1.9 2004/05/31 19:21:32 vapier Exp $
 
 inherit eutils
 
@@ -126,7 +126,7 @@ src_install() {
 
 	rm -rf ${D}/var #empty dir
 
-	dodoc ABOUT-NLS COPYING ChangeLog CheckList INSTALL \
+	dodoc ChangeLog CheckList INSTALL \
 		README ReleaseNotes kernstodo doc/bacula.pdf
 	cp -a examples ${D}/usr/share/doc/${PF}
 	chown -R root:root ${D}/usr/share/doc/${PF} #hrmph :\
diff --git a/app-admin/bacula/bacula-1.34.1.ebuild b/app-admin/bacula/bacula-1.34.1.ebuild
index 63b66c31dc02..196de4660004 100644
--- a/app-admin/bacula/bacula-1.34.1.ebuild
+++ b/app-admin/bacula/bacula-1.34.1.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/app-admin/bacula/bacula-1.34.1.ebuild,v 1.3 2004/04/27 00:29:55 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bacula/bacula-1.34.1.ebuild,v 1.4 2004/05/31 19:21:32 vapier Exp $
 
 DESCRIPTION="featureful client/server network backup suite"
 HOMEPAGE="http://www.bacula.org/"
@@ -108,7 +108,7 @@ src_install() {
 
 	rm -rf ${D}/var #empty dir
 
-	for a in ${S}/{ABOUT-NLS,COPYING,Changelog,CheckList,INSTALL \
+	for a in ${S}/{Changelog,CheckList,INSTALL \
 			README,ReleaseNotes,kernstodo,doc/bacula.pdf}
 	do
 		dodoc $a
diff --git a/app-admin/bastille/bastille-2.1.1-r1.ebuild b/app-admin/bastille/bastille-2.1.1-r1.ebuild
index 16353cf24adf..afc90a58c8b1 100644
--- a/app-admin/bastille/bastille-2.1.1-r1.ebuild
+++ b/app-admin/bastille/bastille-2.1.1-r1.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/bastille/bastille-2.1.1-r1.ebuild,v 1.5 2004/03/24 01:03:05 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bastille/bastille-2.1.1-r1.ebuild,v 1.6 2004/05/31 19:21:32 vapier Exp $
 
 inherit perl-module eutils
 
-IUSE="X"
-
 PATCHVER=0.1
 MY_PN=${PN/b/B}
 MY_P=${MY_PN}-${PV}
@@ -15,9 +13,10 @@ HOMEPAGE="http://bastille-linux.org/"
 SRC_URI="mirror://sourceforge/${PN}-linux/${MY_P}.tar.bz2
 	mirror://gentoo/${P}-gentoo-${PATCHVER}.patch.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ~ppc ~sparc ~alpha"
+IUSE="X"
 
 RDEPEND="net-firewall/iptables
 	app-admin/logrotate
@@ -85,7 +84,7 @@ src_install() {
 
 	# Documentation
 	cd ${S}
-	dodoc *.txt COPYING BUGS Change* README*
+	dodoc *.txt BUGS Change* README*
 }
 
 pkg_postinst() {
diff --git a/app-admin/bastille/bastille-2.1.1-r2.ebuild b/app-admin/bastille/bastille-2.1.1-r2.ebuild
index 4f79b50987a3..5940188830bb 100644
--- a/app-admin/bastille/bastille-2.1.1-r2.ebuild
+++ b/app-admin/bastille/bastille-2.1.1-r2.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/bastille/bastille-2.1.1-r2.ebuild,v 1.2 2004/03/21 02:10:48 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bastille/bastille-2.1.1-r2.ebuild,v 1.3 2004/05/31 19:21:32 vapier Exp $
 
 inherit perl-module eutils
 
-IUSE="X"
-
 PATCHVER=0.1
 MY_PN=${PN/b/B}
 MY_P=${MY_PN}-${PV}
@@ -15,9 +13,10 @@ HOMEPAGE="http://bastille-linux.org/"
 SRC_URI="mirror://sourceforge/${PN}-linux/${MY_P}.tar.bz2
 	mirror://gentoo/${P}-gentoo-${PATCHVER}.patch.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+IUSE="X"
 
 RDEPEND="net-firewall/iptables
 	app-admin/logrotate
@@ -92,7 +91,7 @@ src_install() {
 
 	# Documentation
 	cd ${S}
-	dodoc *.txt COPYING BUGS Change* README*
+	dodoc *.txt BUGS Change* README*
 }
 
 pkg_postinst() {
diff --git a/app-admin/cpu/cpu-1.4.3.ebuild b/app-admin/cpu/cpu-1.4.3.ebuild
index b88518318eb4..9a145e258e5b 100644
--- a/app-admin/cpu/cpu-1.4.3.ebuild
+++ b/app-admin/cpu/cpu-1.4.3.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/app-admin/cpu/cpu-1.4.3.ebuild,v 1.3 2004/05/28 19:26:28 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/cpu/cpu-1.4.3.ebuild,v 1.4 2004/05/31 19:21:32 vapier Exp $
 
 DESCRIPTION="LDAP user management tool written in C and loosely based on FreeBSD's pw(8)"
 HOMEPAGE="http://cpu.sourceforge.net/"
@@ -9,6 +9,7 @@ SRC_URI="mirror://sourceforge/cpu/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
+IUSE=""
 
 RDEPEND="net-nds/openldap
 	sys-libs/cracklib"
@@ -35,5 +36,5 @@ src_compile() {
 
 src_install() {
 	einstall datadir="${D}/usr/share/doc/${PF}" || die "Einstall failure"
-	dodoc AUTHORS COPYING ChangeLog NEWS README TODO
+	dodoc AUTHORS ChangeLog NEWS README TODO
 }
diff --git a/app-admin/cronolog/cronolog-1.6.2-r1.ebuild b/app-admin/cronolog/cronolog-1.6.2-r1.ebuild
index 53e78d0ebb92..44815bf39fdc 100644
--- a/app-admin/cronolog/cronolog-1.6.2-r1.ebuild
+++ b/app-admin/cronolog/cronolog-1.6.2-r1.ebuild
@@ -1,38 +1,31 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/cronolog/cronolog-1.6.2-r1.ebuild,v 1.4 2004/03/09 09:32:54 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/cronolog/cronolog-1.6.2-r1.ebuild,v 1.5 2004/05/31 19:21:32 vapier Exp $
 
 inherit eutils
 
 DESCRIPTION="Cronolog apache logfile rotator"
 HOMEPAGE="http://cronolog.org/"
 SRC_URI="http://cronolog.org/download/${P}.tar.gz"
-DEPEND="virtual/glibc"
-RDEPEND="${DEPEND} net-www/apache"
-KEYWORDS="x86 ~ppc amd64"
+
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="x86 ~ppc amd64"
+IUSE=""
+
+DEPEND="virtual/glibc"
+RDEPEND="${DEPEND} net-www/apache"
 
 src_unpack() {
 	local a
-
-	unpack ${A} ; cd ${S}
-
+	unpack ${A}
+	cd ${S}
 	for a in $( ls -1 ${FILESDIR}/${PV}-patches/ ); do
 		epatch ${FILESDIR}/${PV}-patches/${a}
 	done
 }
 
-src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure 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-admin/cronolog/cronolog-1.6.2.ebuild b/app-admin/cronolog/cronolog-1.6.2.ebuild
index 7e739d1564c2..8bb53d0a6026 100644
--- a/app-admin/cronolog/cronolog-1.6.2.ebuild
+++ b/app-admin/cronolog/cronolog-1.6.2.ebuild
@@ -1,26 +1,20 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/cronolog/cronolog-1.6.2.ebuild,v 1.6 2004/03/09 09:32:54 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/cronolog/cronolog-1.6.2.ebuild,v 1.7 2004/05/31 19:21:32 vapier Exp $
 
 DESCRIPTION="Cronolog apache logfile rotator"
 HOMEPAGE="http://cronolog.org/"
 SRC_URI="http://cronolog.org/download/${P}.tar.gz"
-DEPEND="virtual/glibc"
-RDEPEND="${DEPEND} net-www/apache"
-KEYWORDS="x86 ~ppc ~ia64"
+
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="x86 ~ppc ~ia64"
+IUSE=""
 
-src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
-	emake || die
-}
+DEPEND="virtual/glibc"
+RDEPEND="${DEPEND} net-www/apache"
 
 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-admin/ctcs/ctcs-1.3.0_pre4.ebuild b/app-admin/ctcs/ctcs-1.3.0_pre4.ebuild
index c9c5d3fb5e75..e178e7728c0d 100644
--- a/app-admin/ctcs/ctcs-1.3.0_pre4.ebuild
+++ b/app-admin/ctcs/ctcs-1.3.0_pre4.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/app-admin/ctcs/ctcs-1.3.0_pre4.ebuild,v 1.16 2004/03/12 10:45:38 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ctcs/ctcs-1.3.0_pre4.ebuild,v 1.17 2004/05/31 19:21:32 vapier Exp $
 
 MY_P="${P/_/}"
 S="${WORKDIR}/${MY_P}"
@@ -12,6 +12,7 @@ SRC_URI="mirror://sourceforge/va-ctcs/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc"
+IUSE=""
 
 RDEPEND="dev-util/dialog
 	app-shells/bash
@@ -37,7 +38,7 @@ src_compile() {
 }
 
 src_install() {
-	dodoc CHANGELOG FAQ README.FIRST COPYING README README.TCF runin/README.runtest runin/README.tests
+	dodoc CHANGELOG FAQ README.FIRST README README.TCF runin/README.runtest runin/README.tests
 
 	dodir /usr/ctcs/runin/bin/
 
diff --git a/app-admin/diradm/diradm-1.1.ebuild b/app-admin/diradm/diradm-1.1.ebuild
index 896ef3c1ec90..8036f7518646 100644
--- a/app-admin/diradm/diradm-1.1.ebuild
+++ b/app-admin/diradm/diradm-1.1.ebuild
@@ -1,29 +1,28 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/diradm/diradm-1.1.ebuild,v 1.4 2004/03/12 10:32:03 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/diradm/diradm-1.1.ebuild,v 1.5 2004/05/31 19:21:32 vapier Exp $
 
 DESCRIPTION="diradm is for managing posix users/groups in an LDAP directory"
 HOMEPAGE="http://www.hits.at/diradm/"
 SRC_URI="http://www.hits.at/diradm/diradm-1.1.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
 IUSE=""
+
 DEPEND="net-nds/openldap
-		sys-apps/fileutils
-		sys-apps/grep
-		sys-apps/sed"
+	sys-apps/fileutils
+	sys-apps/grep
+	sys-apps/sed"
 
 src_install() {
-	# Binary
-	dosbin diradm
+	dosbin diradm || die
 
-	# Config file
 	insinto /etc
 	doins diradm.conf
 
-	# Docs
-	dodoc CHANGES COPYING README
+	dodoc CHANGES README
 }
 
 pkg_postinst() {
diff --git a/app-admin/fam/fam-2.7.0.ebuild b/app-admin/fam/fam-2.7.0.ebuild
index e0f9418e263a..a98b4f4e60e5 100644
--- a/app-admin/fam/fam-2.7.0.ebuild
+++ b/app-admin/fam/fam-2.7.0.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/app-admin/fam/fam-2.7.0.ebuild,v 1.14 2004/05/14 01:42:54 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/fam-2.7.0.ebuild,v 1.15 2004/05/31 19:21:32 vapier Exp $
 
 inherit libtool eutils gnuconfig
 
@@ -10,7 +10,8 @@ SRC_URI="ftp://oss.sgi.com/projects/fam/download/stable/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="x86 ppc alpha sparc hppa ~amd64 ia64 mips"
+KEYWORDS="x86 ppc sparc mips alpha hppa ~amd64 ia64"
+IUSE=""
 
 DEPEND=">=net-nds/portmap-5b-r6"
 
@@ -23,12 +24,8 @@ src_unpack() {
 	# Please do not remove this again - fixes $S and $D in libtool linker
 	# scripts (.la files)
 	cd ${S}; elibtoolize
-}
 
-src_compile() {
 	use mips && gnuconfig_update
-	econf || die "econf failed"
-	emake || die "emake failed"
 }
 
 src_install() {
@@ -39,7 +36,7 @@ src_install() {
 	exeinto /etc/init.d
 	doexe ${FILESDIR}/famd
 
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS TODO README
+	dodoc AUTHORS ChangeLog INSTALL NEWS TODO README
 }
 
 pkg_postinst() {
diff --git a/app-admin/fwanalog/fwanalog-0.4-r2.ebuild b/app-admin/fwanalog/fwanalog-0.4-r2.ebuild
index 296d0ebea258..452b8c355ac6 100644
--- a/app-admin/fwanalog/fwanalog-0.4-r2.ebuild
+++ b/app-admin/fwanalog/fwanalog-0.4-r2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/fwanalog/fwanalog-0.4-r2.ebuild,v 1.15 2004/03/29 23:09:37 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fwanalog/fwanalog-0.4-r2.ebuild,v 1.16 2004/05/31 19:21:32 vapier Exp $
 
 DESCRIPTION="Script to parse firewall logs and analyze them with Analog"
 HOMEPAGE="http://tud.at/programm/fwanalog/"
 SRC_URI="http://tud.at/programm/fwanalog/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc sparc"
 IUSE=""
 
@@ -33,7 +33,7 @@ src_install() {
 
 	dosed "s/\"zegrep\"/\"egrep\"/" /etc/fwanalog/fwanalog.opts
 
-	dodoc CONTRIBUTORS COPYING ChangeLog README
+	dodoc CONTRIBUTORS ChangeLog README
 	docinto support ; dodoc support/*
 	docinto langfiles ; dodoc langfiles/*
 }
diff --git a/app-admin/fwanalog/fwanalog-0.6.2.ebuild b/app-admin/fwanalog/fwanalog-0.6.2.ebuild
index f32399625b62..680b479db503 100644
--- a/app-admin/fwanalog/fwanalog-0.6.2.ebuild
+++ b/app-admin/fwanalog/fwanalog-0.6.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/fwanalog/fwanalog-0.6.2.ebuild,v 1.8 2004/03/29 23:09:37 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fwanalog/fwanalog-0.6.2.ebuild,v 1.9 2004/05/31 19:21:32 vapier Exp $
 
 DESCRIPTION="Script to parse firewall logs and analyze them with Analog"
 HOMEPAGE="http://tud.at/programm/fwanalog/"
 SRC_URI="http://tud.at/programm/fwanalog/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ~ppc sparc"
 IUSE=""
 
@@ -33,7 +33,7 @@ src_install() {
 
 	dosed "s/\"zegrep\"/\"egrep\"/" /etc/fwanalog/fwanalog.opts
 
-	dodoc CONTRIBUTORS COPYING ChangeLog README
+	dodoc CONTRIBUTORS ChangeLog README
 	docinto support ; dodoc support/*
 	docinto langfiles ; dodoc langfiles/*
 }
diff --git a/app-admin/fwanalog/fwanalog-0.6.4.ebuild b/app-admin/fwanalog/fwanalog-0.6.4.ebuild
index 03906d234954..8903d95cd09f 100644
--- a/app-admin/fwanalog/fwanalog-0.6.4.ebuild
+++ b/app-admin/fwanalog/fwanalog-0.6.4.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/fwanalog/fwanalog-0.6.4.ebuild,v 1.2 2004/03/29 23:09:37 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fwanalog/fwanalog-0.6.4.ebuild,v 1.3 2004/05/31 19:21:32 vapier Exp $
 
 DESCRIPTION="Script to parse firewall logs and analyze them with Analog"
 HOMEPAGE="http://tud.at/programm/fwanalog/"
 SRC_URI="http://tud.at/programm/fwanalog/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc"
 IUSE=""
 
@@ -33,7 +33,7 @@ src_install() {
 
 	dosed "s/\"zegrep\"/\"egrep\"/" /etc/fwanalog/fwanalog.opts
 
-	dodoc CONTRIBUTORS COPYING ChangeLog README
+	dodoc CONTRIBUTORS ChangeLog README
 	docinto support ; dodoc support/*
 	docinto langfiles ; dodoc langfiles/*
 }
diff --git a/app-admin/genromfs/genromfs-0.5.1.ebuild b/app-admin/genromfs/genromfs-0.5.1.ebuild
index 35100eccd3a1..e8c083184a35 100644
--- a/app-admin/genromfs/genromfs-0.5.1.ebuild
+++ b/app-admin/genromfs/genromfs-0.5.1.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/genromfs/genromfs-0.5.1.ebuild,v 1.13 2004/04/09 07:12:48 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/genromfs/genromfs-0.5.1.ebuild,v 1.14 2004/05/31 19:21:32 vapier Exp $
 
 DESCRIPTION="Create space-efficient, small, read-only romfs filesystems"
-SRC_URI="mirror://sourceforge/romfs/${P}.tar.gz"
 HOMEPAGE="http://romfs.sourceforge.net/"
-IUSE=""
+SRC_URI="mirror://sourceforge/romfs/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc sparc s390"
+IUSE=""
 
 DEPEND="virtual/glibc"
 
@@ -23,8 +23,7 @@ src_compile() {
 }
 
 src_install() {
-	dobin genromfs
+	dobin genromfs || die
 	doman genromfs.8
-	dodoc COPYING ChangeLog NEWS genromfs.lsm genrommkdev \
-		readme-kernel-patch romfs.txt
+	dodoc ChangeLog NEWS genromfs.lsm genrommkdev readme-kernel-patch romfs.txt
 }
diff --git a/app-admin/gnome-system-tools/gnome-system-tools-0.33.0.ebuild b/app-admin/gnome-system-tools/gnome-system-tools-0.33.0.ebuild
index 61ca34858d86..229e29dfef0d 100644
--- a/app-admin/gnome-system-tools/gnome-system-tools-0.33.0.ebuild
+++ b/app-admin/gnome-system-tools/gnome-system-tools-0.33.0.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gnome-system-tools/gnome-system-tools-0.33.0.ebuild,v 1.2 2004/05/26 10:50:22 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gnome-system-tools/gnome-system-tools-0.33.0.ebuild,v 1.3 2004/05/31 19:21:32 vapier Exp $
 
 inherit gnome2
 
-IUSE=""
 DESCRIPTION="Tools aimed to make easy the administration of UNIX systems"
 HOMEPAGE="http://www.gnome.org/projects/gst/"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
+IUSE=""
 
 RDEPEND="net-misc/openssh
 	sys-apps/shadow
@@ -18,11 +18,10 @@ RDEPEND="net-misc/openssh
 	>=gnome-base/libglade-1.99.5
 	>=gnome-base/gconf-2.2
 	>=dev-libs/libxml2-2.4.12"
-
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	>=dev-util/intltool-0.29"
 
-DOCS="AUTHORS BUGS ChangeLog COPYING HACKING NEWS README TODO"
+DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README TODO"
 
 USE_DESTDIR="1"
diff --git a/app-admin/gps/gps-1.1.0.ebuild b/app-admin/gps/gps-1.1.0.ebuild
index b8afbc0ebbf6..73ae6c9aabbc 100644
--- a/app-admin/gps/gps-1.1.0.ebuild
+++ b/app-admin/gps/gps-1.1.0.ebuild
@@ -1,26 +1,25 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gps/gps-1.1.0.ebuild,v 1.6 2004/03/12 10:32:27 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gps/gps-1.1.0.ebuild,v 1.7 2004/05/31 19:21:32 vapier Exp $
 
-DESCRIPTION="Graphical (GTK+1.2) Process Statistics.  Like top, but can show
-processes for machines on the network as well."
+DESCRIPTION="Graphical (GTK+1.2) Process Statistics"
 HOMEPAGE="http://gps.seul.org/"
 SRC_URI="ftp://ftp.seul.org/pub/gps/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ~ppc"
+IUSE=""
 
 DEPEND="=x11-libs/gtk+-1.2*"
 
 src_install() {
-
 	make DESTDIR=${D} install || die
 
 	exeinto /etc/init.d
 	doexe ${FILESDIR}/rgpsp
 
-	dodoc TODO README* CHANGELOG INSTALL COPYING
+	dodoc TODO README* CHANGELOG INSTALL
 
 	doman rgpsp/rgpsp.1
 	doman gps.1x
diff --git a/app-admin/gpsui/gpsui-2.2.ebuild b/app-admin/gpsui/gpsui-2.2.ebuild
index bdb62ff80471..214c8c69770f 100644
--- a/app-admin/gpsui/gpsui-2.2.ebuild
+++ b/app-admin/gpsui/gpsui-2.2.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/app-admin/gpsui/gpsui-2.2.ebuild,v 1.8 2004/04/28 18:53:36 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gpsui/gpsui-2.2.ebuild,v 1.9 2004/05/31 19:21:32 vapier Exp $
 
 DESCRIPTION="GUI program for managing running processes"
 HOMEPAGE="http://gpsui.sourceforge.net/"
@@ -11,23 +11,18 @@ SLOT="0"
 KEYWORDS="x86 ~ppc"
 IUSE="nls"
 
-S="${WORKDIR}/${PN}"
-
 DEPEND="=x11-libs/gtk+-1.2*
 	=gnome-base/gnome-libs-1.4*
 	nls? ( sys-devel/gettext )"
 
-src_compile() {
-	local myconf=""
-	use nls \
-		&& myconf="--enable-nls" \
-		|| myconf="--disable-nls"
-	econf ${myconf} || die "econf failed"
+S="${WORKDIR}/${PN}"
 
+src_compile() {
+	econf `use_enable nls` || die "econf failed"
 	emake || die "Compilation failed"
 }
 
 src_install() {
-	einstall
-	dodoc ABOUT-NLS AUTHORS ChangeLog COPYING README
+	einstall || die
+	dodoc AUTHORS ChangeLog README
 }
diff --git a/app-admin/gwcc/gwcc-0.9.6-r2.ebuild b/app-admin/gwcc/gwcc-0.9.6-r2.ebuild
index daa96b649395..c72ac40be350 100644
--- a/app-admin/gwcc/gwcc-0.9.6-r2.ebuild
+++ b/app-admin/gwcc/gwcc-0.9.6-r2.ebuild
@@ -1,18 +1,17 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gwcc/gwcc-0.9.6-r2.ebuild,v 1.9 2004/04/28 18:54:19 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gwcc/gwcc-0.9.6-r2.ebuild,v 1.10 2004/05/31 19:21:32 vapier Exp $
 
 DESCRIPTION="GNOME Workstation Command Center"
-SRC_URI="mirror://sourceforge/gwcc/${P}.tar.gz"
 HOMEPAGE="http://gwcc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gwcc/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc sparc"
 IUSE="nls"
 
 DEPEND=">=gnome-base/gnome-libs-1.4.1.2-r1"
-
 RDEPEND="nls? ( sys-devel/gettext )
 	sys-apps/net-tools"
 
@@ -29,6 +28,5 @@ src_compile() {
 
 src_install() {
 	make DESTDIR=${D} install || die
-
-	dodoc COPYING ChangeLog NEWS README
+	dodoc ChangeLog NEWS README
 }
diff --git a/app-admin/hddtemp/hddtemp-0.2.ebuild b/app-admin/hddtemp/hddtemp-0.2.ebuild
index 1a9b109b72b9..ff7ef2d19192 100644
--- a/app-admin/hddtemp/hddtemp-0.2.ebuild
+++ b/app-admin/hddtemp/hddtemp-0.2.ebuild
@@ -1,17 +1,18 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.2.ebuild,v 1.19 2004/04/14 07:30:54 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.2.ebuild,v 1.20 2004/05/31 19:21:32 vapier Exp $
 
 inherit eutils
 
 DESCRIPTION="A simple utility to read the temperature of SMART capable hard drives"
+HOMEPAGE="http://coredump.free.fr/linux/hddtemp.php"
 SRC_URI="http://coredump.free.fr/linux/${P}.tar.gz
 	mirror://gentoo/hddtemp.db"
-HOMEPAGE="http://coredump.free.fr/linux/hddtemp.php"
-IUSE=""
-SLOT="0"
+
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc sparc"
+IUSE=""
 
 DEPEND="virtual/glibc"
 
@@ -35,5 +36,5 @@ src_install() {
 	dobin hddtemp
 	insinto /usr/share/hddtemp
 	doins ${DISTDIR}/hddtemp.db
-	dodoc README COPYING
+	dodoc README
 }
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta10.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta10.ebuild
index ed75c6209a9a..a5c8fe8ae2ab 100644
--- a/app-admin/hddtemp/hddtemp-0.3_beta10.ebuild
+++ b/app-admin/hddtemp/hddtemp-0.3_beta10.ebuild
@@ -1,19 +1,21 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta10.ebuild,v 1.3 2004/01/11 03:16:07 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta10.ebuild,v 1.4 2004/05/31 19:21:32 vapier Exp $
 
 MY_P=${P/_beta/-beta}
 
 DESCRIPTION="A simple utility to read the temperature of SMART capable hard drives"
 HOMEPAGE="http://coredump.free.fr/linux/hddtemp.php"
-SLOT="0"
+SRC_URI="http://coredump.free.fr/linux/${MY_P}.tar.gz"
+
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~x86 ~ppc -sparc -amd64"
+IUSE=""
+
 DEPEND="virtual/glibc
 	net-misc/wget"
 
-SRC_URI="http://coredump.free.fr/linux/${MY_P}.tar.gz"
-IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_unpack() {
@@ -36,7 +38,7 @@ src_compile() {
 
 src_install() {
 	make DESTDIR=${D} install
-	dodoc README TODO Changelog COPYING
+	dodoc README TODO Changelog
 
 	insinto /usr/share/hddtemp
 	if [ -f hddtemp.db ]; then
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta11.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta11.ebuild
index aa07510c1b2d..a6b9cd12fc0f 100644
--- a/app-admin/hddtemp/hddtemp-0.3_beta11.ebuild
+++ b/app-admin/hddtemp/hddtemp-0.3_beta11.ebuild
@@ -1,26 +1,28 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta11.ebuild,v 1.4 2004/03/31 14:32:17 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta11.ebuild,v 1.5 2004/05/31 19:21:32 vapier Exp $
 
 MY_P=${P/_beta/-beta}
 
 DESCRIPTION="A simple utility to read the temperature of SMART capable hard drives"
 HOMEPAGE="http://coredump.free.fr/linux/hddtemp.php"
-SLOT="0"
+SRC_URI="http://coredump.free.fr/linux/${MY_P}.tar.gz"
+
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ~ppc -sparc amd64"
+IUSE=""
+
 DEPEND="virtual/glibc
 	net-misc/wget"
 
-SRC_URI="http://coredump.free.fr/linux/${MY_P}.tar.gz"
-IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	unpack ${A} ; cd ${S}
 
 	ebegin "Trying to download the latest hddtemp.db file"
-		wget -q --timeout=10 http://coredump.free.fr/linux/hddtemp.db
+	wget -q --timeout=10 http://coredump.free.fr/linux/hddtemp.db
 	eend $?
 }
 
@@ -36,7 +38,7 @@ src_compile() {
 
 src_install() {
 	make DESTDIR=${D} install
-	dodoc README TODO Changelog COPYING
+	dodoc README TODO Changelog
 
 	insinto /usr/share/hddtemp
 	if [ -f hddtemp.db ]; then
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta8.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta8.ebuild
index 1bac1101d268..0091df837408 100644
--- a/app-admin/hddtemp/hddtemp-0.3_beta8.ebuild
+++ b/app-admin/hddtemp/hddtemp-0.3_beta8.ebuild
@@ -1,19 +1,21 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta8.ebuild,v 1.9 2004/01/13 13:38:30 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta8.ebuild,v 1.10 2004/05/31 19:21:32 vapier Exp $
 
 MY_P=${P/_beta/-beta}
 
 DESCRIPTION="A simple utility to read the temperature of SMART capable hard drives"
 HOMEPAGE="http://coredump.free.fr/linux/hddtemp.php"
-SLOT="0"
+SRC_URI="http://coredump.free.fr/linux/${MY_P}.tar.bz2"
+
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ~ppc sparc amd64"
+IUSE=""
+
 DEPEND="virtual/glibc
 	net-misc/wget"
 
-SRC_URI="http://coredump.free.fr/linux/${MY_P}.tar.bz2"
-IUSE=""
 S=${WORKDIR}/${MY_P}
 
 src_unpack() {
@@ -35,7 +37,7 @@ src_compile() {
 
 src_install() {
 	make DESTDIR=${D} install
-	dodoc README TODO Changelog COPYING
+	dodoc README TODO Changelog
 
 	insinto /usr/share/hddtemp
 	if [ -f hddtemp.db ]; then
diff --git a/app-admin/ide-smart/ide-smart-1.4.ebuild b/app-admin/ide-smart/ide-smart-1.4.ebuild
index 8b10376f690e..0d83f1a76fe9 100644
--- a/app-admin/ide-smart/ide-smart-1.4.ebuild
+++ b/app-admin/ide-smart/ide-smart-1.4.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ide-smart/ide-smart-1.4.ebuild,v 1.17 2004/03/12 10:45:38 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ide-smart/ide-smart-1.4.ebuild,v 1.18 2004/05/31 19:21:32 vapier Exp $
 
 DESCRIPTION="A tool to read SMART information from harddiscs"
-SRC_URI="http://lightside.eresmas.com/${P}.tar.gz"
 HOMEPAGE="http://lightside.eresmas.com/"
+SRC_URI="http://lightside.eresmas.com/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc sparc"
+IUSE=""
 
 DEPEND="virtual/glibc"
 
@@ -25,7 +26,7 @@ src_compile() {
 }
 
 src_install() {
-	dobin ide-smart
+	dobin ide-smart || die
 	doman ide-smart.8
-	dodoc README COPYING
+	dodoc README
 }
diff --git a/app-admin/jinit/jinit-0.1.11.ebuild b/app-admin/jinit/jinit-0.1.11.ebuild
index 3122a5cc0138..ed90af39824d 100644
--- a/app-admin/jinit/jinit-0.1.11.ebuild
+++ b/app-admin/jinit/jinit-0.1.11.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/jinit/jinit-0.1.11.ebuild,v 1.3 2004/04/28 18:55:01 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/jinit/jinit-0.1.11.ebuild,v 1.4 2004/05/31 19:21:32 vapier Exp $
 
 DESCRIPTION="An alternative to sysvinit which supports the need(8) concept"
+HOMEPAGE="http://homepage.ntlworld.com/john.fremlin/programs/linux/jinit/ http://www.atnf.csiro.au/~rgooch/linux/boot-scripts/"
 SRC_URI="http://homepage.ntlworld.com/john.fremlin/programs/linux/jinit/download/${P}.tar.gz"
-HOMEPAGE="http://homepage.ntlworld.com/john.fremlin/programs/linux/jinit/
-	http://www.atnf.csiro.au/~rgooch/linux/boot-scripts/"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc sparc"
+IUSE=""
 
 DEPEND="virtual/glibc"
 RDEPEND=""
@@ -23,7 +23,7 @@ src_install() {
 	make DESTDIR=${D} install || die
 	mv ${D}/usr/sbin ${D}
 	mv ${D}/sbin/init ${D}/sbin/jinit
-	dodoc AUTHORS COPYING ChangeLog NEWS README TODO
+	dodoc AUTHORS ChangeLog NEWS README TODO
 	cp -R example-setup ${D}/usr/share/doc/${PF}
 
 	#find ${D}/usr/share/doc/${PF}/example-setup -name "Makefile*"
diff --git a/app-admin/kedpm/kedpm-0.4.0.ebuild b/app-admin/kedpm/kedpm-0.4.0.ebuild
index e46a4d3e0679..53993573fd4a 100644
--- a/app-admin/kedpm/kedpm-0.4.0.ebuild
+++ b/app-admin/kedpm/kedpm-0.4.0.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/kedpm/kedpm-0.4.0.ebuild,v 1.3 2004/04/27 19:10:21 agriffis Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/app-admin/kedpm/kedpm-0.4.0.ebuild,v 1.4 2004/05/31 19:21:32 vapier Exp $
 
 inherit distutils eutils
 
-DESCRIPTION="Ked Password Manager helps to manage large amounts of passwords and related information."
+DESCRIPTION="Ked Password Manager helps to manage large amounts of passwords and related information"
 HOMEPAGE="http://kedpm.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
 IUSE="gtk2"
-RESTRICT="nomirror"
+
 DEPEND="virtual/python"
 RDEPEND="dev-python/pycrypto
 	gtk2? ( >=dev-python/pygtk-2 )"
@@ -43,7 +43,7 @@ src_unpack() {
 
 src_install() {
 	distutils_src_install
-	dodoc AUTHORS CHANGES COPYING ChangeLog INSTALL NEWS PKG-INFO README
+	dodoc AUTHORS CHANGES ChangeLog INSTALL NEWS PKG-INFO README
 	cp -r test run_tests ${D}/usr/share/${PN}
 }
 
diff --git a/app-admin/lcap/lcap-0.0.6.ebuild b/app-admin/lcap/lcap-0.0.6.ebuild
index 6cb5f05c0c69..c3b6a160b5ee 100644
--- a/app-admin/lcap/lcap-0.0.6.ebuild
+++ b/app-admin/lcap/lcap-0.0.6.ebuild
@@ -1,26 +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/app-admin/lcap/lcap-0.0.6.ebuild,v 1.5 2003/09/23 20:20:55 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/lcap/lcap-0.0.6.ebuild,v 1.6 2004/05/31 19:21:32 vapier Exp $
 
 DESCRIPTION="kernel capability remover"
-
 # The normal homepage of the program was not reachable by the time
 # this ebuild was written
 HOMEPAGE="http://packages.debian.org/unstable/admin/lcap.html"
-
-# same for the sources
 SRC_URI="mirror://debian/pool/main/l/lcap/${P/-/_}.orig.tar.gz"
 
 LICENSE="GPL-2"
-
 SLOT="0"
-
 KEYWORDS="x86"
-
 IUSE="lids"
 
 DEPEND="virtual/os-headers
-		virtual/glibc"
+	virtual/glibc"
 RDEPEND="virtual/glibc"
 
 src_unpack() {
@@ -34,8 +28,7 @@ src_compile() {
 }
 
 src_install() {
-	exeinto /usr/sbin
-	doexe lcap
+	dosbin lcap || die
 	doman lcap.8
 	dodoc README
 }
diff --git a/app-admin/makepasswd/makepasswd-1.10.ebuild b/app-admin/makepasswd/makepasswd-1.10.ebuild
index 96ac32fd35f6..ab116573aad0 100644
--- a/app-admin/makepasswd/makepasswd-1.10.ebuild
+++ b/app-admin/makepasswd/makepasswd-1.10.ebuild
@@ -1,19 +1,20 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/makepasswd/makepasswd-1.10.ebuild,v 1.16 2004/04/15 23:11:42 randy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/makepasswd/makepasswd-1.10.ebuild,v 1.17 2004/05/31 19:21:32 vapier Exp $
 
 DESCRIPTION="Random password generator"
-SRC_URI="mirror://debian/dists/potato/main/source/admin/${P/-/_}.orig.tar.gz"
 HOMEPAGE="http://packages.debian.org/stable/admin/makepasswd.html"
+SRC_URI="mirror://debian/dists/potato/main/source/admin/${P/-/_}.orig.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc ia64 alpha amd64 s390"
+SLOT="0"
+KEYWORDS="x86 ppc sparc alpha amd64 ia64 s390"
+IUSE=""
 
 RDEPEND="dev-lang/perl"
 
 src_install() {
-	dobin makepasswd
+	dobin makepasswd || die
 	doman makepasswd.1
-	dodoc README CHANGES COPYING-2.0
+	dodoc README CHANGES
 }
diff --git a/app-admin/mbr/mbr-1.1.5.ebuild b/app-admin/mbr/mbr-1.1.5.ebuild
index 3ce4ba7ea2b0..eece252a5a60 100644
--- a/app-admin/mbr/mbr-1.1.5.ebuild
+++ b/app-admin/mbr/mbr-1.1.5.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/app-admin/mbr/mbr-1.1.5.ebuild,v 1.5 2004/03/12 10:45:38 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/mbr/mbr-1.1.5.ebuild,v 1.6 2004/05/31 19:21:32 vapier Exp $
 
 DESCRIPTION="A replacement master boot record for IBM-PC compatible computers"
 HOMEPAGE="http://www.chiark.greenend.org.uk/~neilt/mbr/"
 SRC_URI="http://www.chiark.greenend.org.uk/~neilt/mbr/${P}.tar.gz"
-DEPEND="virtual/glibc"
-KEYWORDS="x86 -ppc -sparc -alpha"
+
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="x86 -ppc -sparc -alpha"
+IUSE=""
+
+DEPEND="virtual/glibc"
 
 src_compile() {
 	./configure || die
@@ -17,9 +20,9 @@ src_compile() {
 
 src_install() {
 	into /
-	dosbin install-mbr
+	dosbin install-mbr || die
 	doman install-mbr.8
-	dodoc AUTHORS ChangeLog COPYING INSTALL install-mbr.8 NEWS README TODO
+	dodoc AUTHORS ChangeLog INSTALL install-mbr.8 NEWS README TODO
 }
 
 pkg_postinst() {
diff --git a/app-admin/modlogan/modlogan-0.7.18.ebuild b/app-admin/modlogan/modlogan-0.7.18.ebuild
index 0a977ebf21c0..c9ab68ac8082 100644
--- a/app-admin/modlogan/modlogan-0.7.18.ebuild
+++ b/app-admin/modlogan/modlogan-0.7.18.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/modlogan/modlogan-0.7.18.ebuild,v 1.14 2004/04/26 15:20:33 agriffis Exp $
-
-IUSE="nls mysql"
+# $Header: /var/cvsroot/gentoo-x86/app-admin/modlogan/modlogan-0.7.18.ebuild,v 1.15 2004/05/31 19:21:32 vapier Exp $
 
 DESCRIPTION="Logfile Analyzer"
+HOMEPAGE="http://jan.kneschke.de/projects/modlogan/"
 SRC_URI="http://jan.kneschke.de/projects/modlogan/download/${P}.tar.gz
 	 http://www.kneschke.de/projekte/modlogan/download/gd-1.8.1.tar.gz"
-HOMEPAGE="http://jan.kneschke.de/projects/modlogan/"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc sparc"
+IUSE="nls mysql"
 
 DEPEND="virtual/x11
 	dev-libs/libxml
@@ -22,7 +21,6 @@ DEPEND="virtual/x11
 	>=dev-libs/libpcre-3.2
 	>=net-libs/adns-1.0
 	mysql? ( >=dev-db/mysql-3.23.26 )"
-
 RDEPEND="nls? ( sys-devel/gettext )"
 
 src_compile() {
@@ -72,7 +70,7 @@ src_install() {
 	newins ${FILESDIR}/modlogan.conf httpd.modlogan
 	dodir /home/httpd/modlogan
 	preplib /usr
-	dodoc AUTHORS COPYING ChangeLog README NEWS TODO
+	dodoc AUTHORS ChangeLog README NEWS TODO
 	dodoc doc/*.txt doc/*.conf doc/glosar doc/stats
 	dohtml -r html
 }
diff --git a/app-admin/modlogan/modlogan-0.7.4-r1.ebuild b/app-admin/modlogan/modlogan-0.7.4-r1.ebuild
index 99ff107175b7..2a2e73628b6d 100644
--- a/app-admin/modlogan/modlogan-0.7.4-r1.ebuild
+++ b/app-admin/modlogan/modlogan-0.7.4-r1.ebuild
@@ -1,18 +1,16 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/modlogan/modlogan-0.7.4-r1.ebuild,v 1.19 2004/02/22 17:40:47 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/modlogan/modlogan-0.7.4-r1.ebuild,v 1.20 2004/05/31 19:21:32 vapier Exp $
 
-IUSE="nls mysql"
-
-S=${WORKDIR}/${P}
 DESCRIPTION="Logfile Analyzer"
+HOMEPAGE="http://jan.kneschke.de/projects/modlogan/"
 SRC_URI="http://www.kneschke.de/projekte/modlogan/download/${P}.tar.gz
 	 http://www.kneschke.de/projekte/modlogan/download/gd-1.8.1.tar.gz"
-HOMEPAGE="http://jan.kneschke.de/projects/modlogan/"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc sparc"
+IUSE="nls mysql"
 
 DEPEND="virtual/x11
 	dev-libs/libxml
@@ -23,7 +21,6 @@ DEPEND="virtual/x11
 	>=dev-libs/libpcre-3.2
 	>=net-libs/adns-1.0
 	mysql? ( >=dev-db/mysql-3.23.26 )"
-
 RDEPEND="nls? ( sys-devel/gettext )"
 
 src_compile() {
@@ -75,7 +72,7 @@ src_install() {
 	newins ${FILESDIR}/modlogan.conf httpd.modlogan
 	dodir /usr/local/httpd/modlogan
 	preplib /usr
-	dodoc AUTHORS COPYING ChangeLog README NEWS TODO
+	dodoc AUTHORS ChangeLog README NEWS TODO
 	dodoc doc/*.txt doc/*.conf doc/glosar doc/stats
 	docinto html
 	dodoc doc/*.html
diff --git a/app-admin/modlogan/modlogan-0.8.10-r1.ebuild b/app-admin/modlogan/modlogan-0.8.10-r1.ebuild
index 1c48fb644cf7..f34e3bcb19ae 100644
--- a/app-admin/modlogan/modlogan-0.8.10-r1.ebuild
+++ b/app-admin/modlogan/modlogan-0.8.10-r1.ebuild
@@ -1,23 +1,20 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/modlogan/modlogan-0.8.10-r1.ebuild,v 1.6 2004/05/04 13:35:30 kloeri Exp $
-
-IUSE="nls mysql X"
+# $Header: /var/cvsroot/gentoo-x86/app-admin/modlogan/modlogan-0.8.10-r1.ebuild,v 1.7 2004/05/31 19:21:32 vapier Exp $
 
+MY_FILESDIR="${FILESDIR}/${PV%.*}"
 THEMES_VERSION="0.0.5"
 
 DESCRIPTION="Logfile Analyzer"
+HOMEPAGE="http://jan.kneschke.de/projects/modlogan/"
 SRC_URI="http://jan.kneschke.de/projects/modlogan/download/${P}.tar.gz
 	 http://jan.kneschke.de/projects/modlogan/download/modlogan-themes-${THEMES_VERSION}.tar.gz
 	 http://www.kneschke.de/projekte/modlogan/download/gd-1.8.1.tar.gz"
 
-HOMEPAGE="http://jan.kneschke.de/projects/modlogan/"
-
-MY_FILESDIR="${FILESDIR}/${PV%.*}"
-
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ~ia64 ~amd64 ~ppc sparc alpha hppa"
+IUSE="nls mysql X"
 
 DEPEND="dev-libs/libxml
 	dev-libs/libxml2
@@ -28,7 +25,6 @@ DEPEND="dev-libs/libxml
 	>=net-libs/adns-1.0
 	X? ( virtual/x11 )
 	mysql? ( >=dev-db/mysql-3.23.26 )"
-
 RDEPEND="nls? ( sys-devel/gettext )"
 
 src_compile() {
@@ -88,7 +84,7 @@ src_install() {
 ###
 	keepdir /var/www/localhost/htdocs/modlogan
 	preplib /usr
-	dodoc AUTHORS COPYING ChangeLog README NEWS TODO
+	dodoc AUTHORS ChangeLog README NEWS TODO
 	dodoc doc/*.txt doc/*.conf doc/*-dist doc/glosar doc/stats
 	dohtml -r html
 
diff --git a/app-admin/modlogan/modlogan-0.8.10.ebuild b/app-admin/modlogan/modlogan-0.8.10.ebuild
index 20e87bc3b0e8..84044e1c4ba1 100644
--- a/app-admin/modlogan/modlogan-0.8.10.ebuild
+++ b/app-admin/modlogan/modlogan-0.8.10.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/modlogan/modlogan-0.8.10.ebuild,v 1.5 2004/04/12 16:04:42 zx Exp $
-
-IUSE="nls mysql"
+# $Header: /var/cvsroot/gentoo-x86/app-admin/modlogan/modlogan-0.8.10.ebuild,v 1.6 2004/05/31 19:21:32 vapier Exp $
 
 DESCRIPTION="Logfile Analyzer"
+HOMEPAGE="http://jan.kneschke.de/projects/modlogan/"
 SRC_URI="http://jan.kneschke.de/projects/modlogan/download/${P}.tar.gz
 	 http://www.kneschke.de/projekte/modlogan/download/gd-1.8.1.tar.gz"
-HOMEPAGE="http://jan.kneschke.de/projects/modlogan/"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ia64 ~amd64 ~ppc ~sparc ~alpha hppa"
+SLOT="0"
+KEYWORDS="x86 ~ppc ~sparc ~alpha hppa ~amd64 ~ia64"
+IUSE="nls mysql"
 
 DEPEND="virtual/x11
 	dev-libs/libxml
@@ -22,7 +21,6 @@ DEPEND="virtual/x11
 	>=dev-libs/libpcre-3.2
 	>=net-libs/adns-1.0
 	mysql? ( >=dev-db/mysql-3.23.26 )"
-
 RDEPEND="nls? ( sys-devel/gettext )"
 
 src_compile() {
@@ -72,7 +70,7 @@ src_install() {
 	newins ${FILESDIR}/modlogan.conf httpd.modlogan
 	dodir /home/httpd/modlogan
 	preplib /usr
-	dodoc AUTHORS COPYING ChangeLog README NEWS TODO
+	dodoc AUTHORS ChangeLog README NEWS TODO
 	dodoc doc/*.txt doc/*.conf doc/glosar doc/stats
 	dohtml -r html
 }
diff --git a/app-admin/mon/mon-0.99.2-r1.ebuild b/app-admin/mon/mon-0.99.2-r1.ebuild
index d7c85f4d49a0..70ee7a20403c 100644
--- a/app-admin/mon/mon-0.99.2-r1.ebuild
+++ b/app-admin/mon/mon-0.99.2-r1.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/mon/mon-0.99.2-r1.ebuild,v 1.14 2004/03/12 05:44:40 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/mon/mon-0.99.2-r1.ebuild,v 1.15 2004/05/31 19:21:32 vapier Exp $
 
 DESCRIPTION="highly configurable service monitoring daemon"
-SRC_URI="mirror://kernel/software/admin/mon/${P}.tar.bz2"
 HOMEPAGE="http://www.kernel.org/software/mon/"
+SRC_URI="mirror://kernel/software/admin/mon/${P}.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc sparc"
+IUSE=""
 
 DEPEND=">=dev-perl/Mon-0.9
 	>=dev-perl/Time-HiRes-01.20
@@ -35,7 +36,7 @@ src_install() {
 
 	doman doc/*.1
 	doman doc/*.8
-	dodoc CHANGES COPYING CREDITS KNOWN-PROBLEMS
+	dodoc CHANGES CREDITS KNOWN-PROBLEMS
 	dodoc mon.lsm README TODO VERSION
 	docinto txt ; dodoc doc/README*
 	docinto etc ; dodoc etc/*
diff --git a/app-admin/msyslog/msyslog-1.09a-r1.ebuild b/app-admin/msyslog/msyslog-1.09a-r1.ebuild
index 3de7d44153a1..195a0dd00913 100644
--- a/app-admin/msyslog/msyslog-1.09a-r1.ebuild
+++ b/app-admin/msyslog/msyslog-1.09a-r1.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/msyslog/msyslog-1.09a-r1.ebuild,v 1.5 2004/03/29 23:14:55 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/msyslog/msyslog-1.09a-r1.ebuild,v 1.6 2004/05/31 19:21:32 vapier Exp $
 
 inherit eutils
 
-IUSE="postgres mysql"
-
 #lame upstream conventions...
 #archive:    msyslog-1.09a-src.tar.gz
 #unpacks to: msyslog-v1.09a/
@@ -15,15 +13,15 @@ DESCRIPTION="Flexible and easy to integrate syslog with modularized input/output
 HOMEPAGE="http://sourceforge.net/projects/msyslog/"
 SRC_URI="mirror://sourceforge/msyslog/${P}-src.tar.gz"
 
-SLOT="0"
 LICENSE="BSD"
-KEYWORDS="x86 sparc ppc hppa ~mips ~amd64"
+SLOT="0"
+KEYWORDS="x86 ppc sparc ~mips hppa ~amd64"
+IUSE="postgres mysql"
 
 DEPEND="virtual/glibc"
 RDEPEND="${DEPEND}
 	mysql? ( >=dev-db/mysql-3.23 )
 	postgres? ( >=dev-db/postgresql-7 )"
-
 PROVIDE="virtual/logger"
 
 src_unpack() {
@@ -35,7 +33,8 @@ src_unpack() {
 }
 
 src_compile() {
-	econf --with-daemon-name=msyslogd \
+	econf \
+		--with-daemon-name=msyslogd \
 		`use_with mysql` \
 		`use_with postgres pgsql` \
 		${myconf} || die
@@ -57,7 +56,7 @@ src_install() {
 	mv src/man/syslog.conf.5 src/man/msyslog.conf.5
 	doman src/man/*.[85]
 
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS \
+	dodoc AUTHORS ChangeLog INSTALL NEWS \
 		QUICK_INSTALL README src/TODO doc/*
 	docinto examples ; dodoc src/examples/*
 
diff --git a/app-admin/newsyslog/newsyslog-1.0.103.ebuild b/app-admin/newsyslog/newsyslog-1.0.103.ebuild
index 7d8457da3e44..4af6d03bbcff 100644
--- a/app-admin/newsyslog/newsyslog-1.0.103.ebuild
+++ b/app-admin/newsyslog/newsyslog-1.0.103.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/app-admin/newsyslog/newsyslog-1.0.103.ebuild,v 1.15 2004/05/04 13:39:25 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/newsyslog/newsyslog-1.0.103.ebuild,v 1.16 2004/05/31 19:21:32 vapier Exp $
 
 inherit eutils
 
@@ -8,16 +8,18 @@ DESCRIPTION="An enhanced version of newsyslog originally written by Theodore Ts'
 HOMEPAGE="http://www.weird.com/~woods/projects/newsyslog.html"
 SRC_URI="ftp://ftp.weird.com/pub/local/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="MIT"
-KEYWORDS="x86 ~ppc ~sparc ~alpha hppa ~mips"
+SLOT="0"
+KEYWORDS="x86 ~ppc ~sparc ~mips ~alpha hppa"
+IUSE=""
 
 DEPEND="sys-apps/groff"
 RDEPEND="virtual/cron
 	app-arch/gzip"
 
 src_unpack() {
-	unpack ${A} ; cd ${S}
+	unpack ${A}
+	cd ${S}
 	epatch ${FILESDIR}/newsyslog-html.patch
 }
 
@@ -40,6 +42,6 @@ src_install() {
 
 	rm -rf ${D}/usr/share/man/cat?
 
-	dodoc newsyslog.conf AUTHORS COPYING ChangeLog INSTALL NEWS README.* ToDo
+	dodoc newsyslog.conf AUTHORS ChangeLog INSTALL NEWS README.* ToDo
 	prepalldocs
 }
diff --git a/app-admin/newsyslog/newsyslog-1.1.ebuild b/app-admin/newsyslog/newsyslog-1.1.ebuild
index 4e62b6fe341a..a6782cac924c 100644
--- a/app-admin/newsyslog/newsyslog-1.1.ebuild
+++ b/app-admin/newsyslog/newsyslog-1.1.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/app-admin/newsyslog/newsyslog-1.1.ebuild,v 1.9 2004/05/04 13:39:25 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/newsyslog/newsyslog-1.1.ebuild,v 1.10 2004/05/31 19:21:32 vapier Exp $
 
 inherit eutils
 
@@ -8,9 +8,10 @@ DESCRIPTION="An enhanced version of newsyslog originally written by Theodore Ts'
 HOMEPAGE="http://www.weird.com/~woods/projects/newsyslog.html"
 SRC_URI="ftp://ftp.weird.com/pub/local/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="MIT"
-KEYWORDS="x86 ~ppc ~sparc alpha hppa ~mips"
+SLOT="0"
+KEYWORDS="x86 ~ppc ~sparc ~mips alpha hppa"
+IUSE=""
 
 DEPEND="sys-apps/groff"
 RDEPEND="virtual/cron
@@ -40,6 +41,6 @@ src_install() {
 
 	rm -rf ${D}/usr/share/man/cat?
 
-	dodoc newsyslog.conf AUTHORS COPYING ChangeLog INSTALL NEWS README.* ToDo
+	dodoc newsyslog.conf AUTHORS ChangeLog INSTALL NEWS README.* ToDo
 	prepalldocs
 }
diff --git a/app-admin/pcihpview/pcihpview-0.5.ebuild b/app-admin/pcihpview/pcihpview-0.5.ebuild
index b008ef784f2a..cb4ffc042ece 100644
--- a/app-admin/pcihpview/pcihpview-0.5.ebuild
+++ b/app-admin/pcihpview/pcihpview-0.5.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/pcihpview/pcihpview-0.5.ebuild,v 1.2 2004/04/28 18:55:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/pcihpview/pcihpview-0.5.ebuild,v 1.3 2004/05/31 19:21:32 vapier Exp $
 
 DESCRIPTION="Display all PCI Hotplug devices in the system"
+HOMEPAGE="http://www.kroah.com/linux/hotplug/"
 SRC_URI="http://www.kroah.com/linux/hotplug/${P}.tar.gz"
-HOMEPAGE="http://www.kroah.com/linux/hotplug"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc sparc amd64"
+IUSE=""
 
 DEPEND="=x11-libs/gtk+-1.2*"
 
@@ -19,5 +20,5 @@ src_compile() {
 
 src_install() {
 	make DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog COPYING NEWS README TODO
+	dodoc AUTHORS ChangeLog NEWS README TODO
 }
diff --git a/app-admin/powertweak/powertweak-0.99.4.ebuild b/app-admin/powertweak/powertweak-0.99.4.ebuild
index fb4c90416213..61dee1e56eb8 100644
--- a/app-admin/powertweak/powertweak-0.99.4.ebuild
+++ b/app-admin/powertweak/powertweak-0.99.4.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/powertweak/powertweak-0.99.4.ebuild,v 1.11 2004/04/26 15:21:23 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/powertweak/powertweak-0.99.4.ebuild,v 1.12 2004/05/31 19:21:32 vapier Exp $
 
 inherit libtool
 
 DESCRIPTION="tune your kernel and hardware settings for optimal performance"
-SRC_URI="mirror://sourceforge/powertweak/${P}.tar.bz2"
 HOMEPAGE="http://powertweak.sourceforge.net/"
+SRC_URI="mirror://sourceforge/powertweak/${P}.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 -ppc"
 IUSE="gtk"
 
@@ -17,7 +17,6 @@ DEPEND="gtk? ( =x11-libs/gtk+-1.2* )
 	>=dev-libs/libxml-1.8.10
 	sys-devel/autoconf
 	sys-devel/automake"
-
 RDEPEND=">=sys-apps/pciutils-2.1.0
 	gtk? ( =x11-libs/gtk+-1.2* )"
 
@@ -49,7 +48,7 @@ src_compile() {
 
 src_install() {
 	make DESTDIR=${D} install || die
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README
+	dodoc AUTHORS ChangeLog INSTALL NEWS README
 	docinto Documentation
 	dodoc Documentation/* Documentation/Hackers/*
 
@@ -58,6 +57,6 @@ src_install() {
 	exeinto /etc/init.d ; newexe ${FILESDIR}/powertweakd.rc6 powertweakd
 }
 
-pkg_postins() {
+pkg_postinst() {
 	einfo "This version adds powertweakd to be run at boot to apply changes to system"
 }
diff --git a/app-admin/powertweak/powertweak-0.99.5-r1.ebuild b/app-admin/powertweak/powertweak-0.99.5-r1.ebuild
index a9ce90332519..fa9ac39ac3ba 100644
--- a/app-admin/powertweak/powertweak-0.99.5-r1.ebuild
+++ b/app-admin/powertweak/powertweak-0.99.5-r1.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/powertweak/powertweak-0.99.5-r1.ebuild,v 1.2 2004/04/18 08:47:05 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/powertweak/powertweak-0.99.5-r1.ebuild,v 1.3 2004/05/31 19:21:33 vapier Exp $
 
 inherit eutils
 
 DESCRIPTION="Tune your kernel and hardware settings for optimal performance"
 HOMEPAGE="http://powertweak.sourceforge.net/"
-SRC_URI="mirror://sourceforge/powertweak/${P}.tar.bz2 http://dev.gentoo.org/~spock/portage/distfiles/powertweak-0.99.5-cvs20040417.patch.bz2"
+SRC_URI="mirror://sourceforge/powertweak/${P}.tar.bz2
+	http://dev.gentoo.org/~spock/portage/distfiles/powertweak-0.99.5-cvs20040417.patch.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -17,7 +18,6 @@ DEPEND="gtk? ( =x11-libs/gtk+-1.2* )
 	>=dev-libs/libxml2-2.3.0
 	sys-devel/autoconf
 	sys-devel/automake"
-
 RDEPEND=">=sys-apps/pciutils-2.1.0
 	gtk? ( =x11-libs/gtk+-1.2* )"
 
@@ -35,7 +35,7 @@ src_compile() {
 src_install() {
 	make DESTDIR=${D} install || die
 
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README
+	dodoc AUTHORS ChangeLog INSTALL NEWS README
 	docinto Documentation
 	dodoc Documentation/* Documentation/Hackers/*
 
diff --git a/app-admin/powertweak/powertweak-0.99.5.ebuild b/app-admin/powertweak/powertweak-0.99.5.ebuild
index a0cb0a909804..6ab53401f820 100644
--- a/app-admin/powertweak/powertweak-0.99.5.ebuild
+++ b/app-admin/powertweak/powertweak-0.99.5.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/app-admin/powertweak/powertweak-0.99.5.ebuild,v 1.2 2004/03/12 10:45:39 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/powertweak/powertweak-0.99.5.ebuild,v 1.3 2004/05/31 19:21:33 vapier Exp $
 
 inherit eutils
 
@@ -17,7 +17,6 @@ DEPEND="gtk? ( =x11-libs/gtk+-1.2* )
 	>=dev-libs/libxml2-2.3.0
 	sys-devel/autoconf
 	sys-devel/automake"
-
 RDEPEND=">=sys-apps/pciutils-2.1.0
 	gtk? ( =x11-libs/gtk+-1.2* )"
 
@@ -29,7 +28,7 @@ src_compile() {
 src_install() {
 	make DESTDIR=${D} install || die
 
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README
+	dodoc AUTHORS ChangeLog INSTALL NEWS README
 	docinto Documentation
 	dodoc Documentation/* Documentation/Hackers/*
 
diff --git a/app-admin/procman/procman-0.99.0.ebuild b/app-admin/procman/procman-0.99.0.ebuild
index c6fe5290505e..dd436cbe771f 100644
--- a/app-admin/procman/procman-0.99.0.ebuild
+++ b/app-admin/procman/procman-0.99.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/procman/procman-0.99.0.ebuild,v 1.16 2004/04/25 21:41:18 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/procman/procman-0.99.0.ebuild,v 1.17 2004/05/31 19:21:33 vapier Exp $
 
 DESCRIPTION="Process viewer for GNOME"
-SRC_URI="http://www.personal.psu.edu/users/k/f/kfv101/procman/source/${P}.tar.gz"
 HOMEPAGE="http://www.personal.psu.edu/kfv101/procman"
+SRC_URI="http://www.personal.psu.edu/users/k/f/kfv101/procman/source/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 sparc"
 IUSE="nls"
 
@@ -27,6 +27,5 @@ src_compile() {
 
 src_install() {
 	einstall
-
-	dodoc AUTHORS COPYING ChangeLog README NEWS TODO
+	dodoc AUTHORS ChangeLog README NEWS TODO
 }
diff --git a/app-admin/procman/procman-1.0.ebuild b/app-admin/procman/procman-1.0.ebuild
index 237d4820222c..1a9686c15c31 100644
--- a/app-admin/procman/procman-1.0.ebuild
+++ b/app-admin/procman/procman-1.0.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/procman/procman-1.0.ebuild,v 1.19 2004/04/25 21:41:18 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/procman/procman-1.0.ebuild,v 1.20 2004/05/31 19:21:33 vapier Exp $
 
 DESCRIPTION="Process viewer for GNOME"
-SRC_URI="mirror://gnome/sources/procman/${PV}/${P}.tar.gz"
 HOMEPAGE="http://www.personal.psu.edu/kfv101/procman"
+SRC_URI="mirror://gnome/sources/procman/${PV}/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 sparc ppc"
+SLOT="0"
+KEYWORDS="x86 ppc sparc"
 IUSE="nls"
 
 DEPEND="<gnome-extra/gal-1.99
@@ -26,7 +26,6 @@ src_compile() {
 }
 
 src_install() {
-	einstall
-
-	dodoc AUTHORS COPYING ChangeLog README NEWS TODO
+	einstall || die
+	dodoc AUTHORS ChangeLog README NEWS TODO
 }
diff --git a/app-admin/pydf/pydf-0.9.6.ebuild b/app-admin/pydf/pydf-0.9.6.ebuild
index 22ec14288d69..8bdc693e48ac 100644
--- a/app-admin/pydf/pydf-0.9.6.ebuild
+++ b/app-admin/pydf/pydf-0.9.6.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/app-admin/pydf/pydf-0.9.6.ebuild,v 1.4 2004/03/12 10:45:39 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/pydf/pydf-0.9.6.ebuild,v 1.5 2004/05/31 19:21:33 vapier Exp $
 
 DESCRIPTION="Enhanced df with colors"
 HOMEPAGE="http://melkor.dnp.fmph.uniba.sk/~garabik/pydf"
@@ -9,14 +9,15 @@ SRC_URI="http://melkor.dnp.fmph.uniba.sk/~garabik/pydf/pydf_${PV}.tar.gz"
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="x86 ~ppc ~sparc"
+IUSE=""
 
 RDEPEND="dev-lang/python"
 
 src_compile() { return 0; }
 
 src_install() {
-	dobin pydf
-	dodoc COPYING INSTALL README
+	dobin pydf || die
+	dodoc INSTALL README
 	doman pydf.1
 	insinto /etc
 	doins pydfrc
diff --git a/app-admin/rackview/rackview-0.04-r1.ebuild b/app-admin/rackview/rackview-0.04-r1.ebuild
index bd77bf469300..8d52a4f3b02c 100644
--- a/app-admin/rackview/rackview-0.04-r1.ebuild
+++ b/app-admin/rackview/rackview-0.04-r1.ebuild
@@ -1,22 +1,24 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rackview/rackview-0.04-r1.ebuild,v 1.5 2004/01/06 11:59:20 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rackview/rackview-0.04-r1.ebuild,v 1.6 2004/05/31 19:21:33 vapier Exp $
 
 inherit perl-module
 
-DESCRIPTION="rackview is a tool for visualizing the layout of rack-mounted equipment. The purpose of this tool is to assist in planning and tracking of hardware changes to racks in a data center, and to provide a host-oriented interface into other database tools."
+DESCRIPTION="tool for visualizing the layout of rack-mounted equipment"
+HOMEPAGE="http://rackview.sourceforge.net/"
 SRC_URI="mirror://sourceforge/rackview/rackview-${PV}.tar.gz"
-HOMEPAGE="http://rackview.sf.net"
 
+LICENSE="Artistic"
 SLOT="0"
 KEYWORDS="x86"
-LICENSE="Artistic"
 IUSE="apache2 mysql"
+
 DEPEND="dev-lang/perl
 	dev-perl/GD
 	dev-perl/DBI
 	mysql? ( dev-db/mysql )"
-DOCS="ChangeLog COPYING README* doc/*"
+
+DOCS="ChangeLog README* doc/*"
 
 src_install() {
 	#In case of Apache
diff --git a/app-admin/rackview/rackview-0.05.ebuild b/app-admin/rackview/rackview-0.05.ebuild
index 0e5cecb751ab..e6bebf91c726 100644
--- a/app-admin/rackview/rackview-0.05.ebuild
+++ b/app-admin/rackview/rackview-0.05.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/app-admin/rackview/rackview-0.05.ebuild,v 1.5 2004/02/29 23:05:58 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rackview/rackview-0.05.ebuild,v 1.6 2004/05/31 19:21:33 vapier Exp $
 
 inherit perl-module
 
@@ -18,10 +18,10 @@ DEPEND="dev-lang/perl
 	dev-perl/DBI
 	mysql? ( dev-db/mysql )"
 
-DOCS="ChangeLog COPYING README* doc/*"
+DOCS="ChangeLog README* doc/*"
 
 src_install() {
-	if [ `use apache2` ] ; then
+	if use apache2 ; then
 		#In case of Apache
 		HTTPD_ROOT="`grep '^DocumentRoot' /etc/apache2/conf/apache2.conf | cut -d\  -f2`" \
 		HTTPD_USER="`grep '^User' /etc/apache2/conf/commonapache2.conf | cut -d \  -f2`" \
@@ -82,7 +82,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [ `use mysql` ] ; then
+	if use mysql ; then
 		einfo "To load data from mysql, change 'dat' in 'db'" \
 		einfo "in /etc/${PN}/${PN}.conf" \
 		einfo "SQL files for creating these tables are available" \
diff --git a/app-admin/realpath/realpath-1.9.10.ebuild b/app-admin/realpath/realpath-1.9.10.ebuild
index 04a3a118496b..b127d20acef4 100644
--- a/app-admin/realpath/realpath-1.9.10.ebuild
+++ b/app-admin/realpath/realpath-1.9.10.ebuild
@@ -1,13 +1,15 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/realpath/realpath-1.9.10.ebuild,v 1.1 2004/05/13 16:14:58 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/realpath/realpath-1.9.10.ebuild,v 1.2 2004/05/31 19:21:33 vapier Exp $
 
 DESCRIPTION="Return the canonicalized absolute pathname"
 HOMEPAGE="http://packages.debian.org/unstable/utils/realpath.html"
 SRC_URI="mirror://debian/pool/main/d/dwww/dwww_${PV}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~sparc ~mips ~ppc amd64"
+KEYWORDS="x86 ~ppc ~sparc ~mips amd64"
+IUSE=""
 
 S=${WORKDIR}/dwww-${PV}
 
@@ -16,7 +18,7 @@ src_compile() {
 }
 
 src_install() {
-	dobin realpath
+	dobin realpath || die
 	doman man/realpath.1
-	dodoc COPYING README TODO BUGS
+	dodoc README TODO BUGS
 }
diff --git a/app-admin/realpath/realpath-1.9.3.ebuild b/app-admin/realpath/realpath-1.9.3.ebuild
index 00ac37f2bd12..9186db9f76ff 100644
--- a/app-admin/realpath/realpath-1.9.3.ebuild
+++ b/app-admin/realpath/realpath-1.9.3.ebuild
@@ -1,13 +1,15 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/realpath/realpath-1.9.3.ebuild,v 1.6 2004/02/22 15:49:26 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/realpath/realpath-1.9.3.ebuild,v 1.7 2004/05/31 19:21:33 vapier Exp $
 
 DESCRIPTION="Return the canonicalized absolute pathname"
 HOMEPAGE="http://packages.debian.org/unstable/utils/realpath.html"
 SRC_URI="mirror://debian/pool/main/d/dwww/dwww_${PV}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~sparc ~mips ~ppc amd64"
+KEYWORDS="x86 ~ppc ~sparc ~mips amd64"
+IUSE=""
 
 S=${WORKDIR}/dwww-${PV}
 
@@ -16,7 +18,7 @@ src_compile() {
 }
 
 src_install() {
-	dobin realpath
+	dobin realpath || die
 	doman man/realpath.1
-	dodoc COPYING README TODO
+	dodoc README TODO
 }
diff --git a/app-admin/setools/setools-1.3.1.ebuild b/app-admin/setools/setools-1.3.1.ebuild
index c2f4afdec3ef..b27da8e3f6d1 100644
--- a/app-admin/setools/setools-1.3.1.ebuild
+++ b/app-admin/setools/setools-1.3.1.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/app-admin/setools/setools-1.3.1.ebuild,v 1.2 2004/05/24 20:21:04 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-1.3.1.ebuild,v 1.3 2004/05/31 19:21:33 vapier Exp $
 
 DESCRIPTION="SELinux policy tools"
 HOMEPAGE="http://www.tresys.com/selinux_policy_tools.html"
@@ -16,7 +16,6 @@ DEPEND="sys-devel/bison
 	dev-libs/libxml2
 	dev-util/pkgconfig
 	X? ( dev-lang/tk gtk? ( >=gnome-base/libglade-2.0 ) )"
-
 RDEPEND="dev-libs/libxml2
 	X? (
 		dev-lang/tk
@@ -78,7 +77,7 @@ src_compile() {
 src_install() {
 	cd ${S}
 
-	dodoc COPYING ChangeLog-setools README
+	dodoc ChangeLog-setools README
 
 	# some of the Makefiles are broken, and will fail
 	# if ${D}/usr/bin is nonexistant
diff --git a/app-admin/sysklogd/sysklogd-1.4.1-r10.ebuild b/app-admin/sysklogd/sysklogd-1.4.1-r10.ebuild
index e0a0c0bcbada..d6d6afea6b34 100644
--- a/app-admin/sysklogd/sysklogd-1.4.1-r10.ebuild
+++ b/app-admin/sysklogd/sysklogd-1.4.1-r10.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/app-admin/sysklogd/sysklogd-1.4.1-r10.ebuild,v 1.13 2004/05/04 13:48:19 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysklogd/sysklogd-1.4.1-r10.ebuild,v 1.14 2004/05/31 19:21:33 vapier Exp $
 
 inherit eutils
 
@@ -8,13 +8,13 @@ DESCRIPTION="Standard log daemons"
 HOMEPAGE="http://www.infodrom.org/projects/sysklogd/"
 SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/daemons/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="BSD"
-KEYWORDS="x86 ppc sparc alpha hppa mips ia64 amd64 ppc64 s390"
+SLOT="0"
+KEYWORDS="x86 ppc sparc mips alpha hppa amd64 ia64 ppc64 s390"
+IUSE=""
 
 DEPEND="virtual/glibc"
 RDEPEND="dev-lang/perl sys-apps/debianutils"
-
 PROVIDE="virtual/logger"
 
 src_unpack() {
@@ -29,9 +29,9 @@ src_unpack() {
 
 	if [ "${ARCH}" = "mips" ]
 	then
-	   cd ${S}
-	    epatch ${FILESDIR}/${PN}-1.4.1-mips.patch
-	 fi
+		cd ${S}
+		epatch ${FILESDIR}/${PN}-1.4.1-mips.patch
+	fi
 }
 
 src_compile() {
@@ -43,7 +43,7 @@ src_install() {
 	doman *.[1-9] ${FILESDIR}/syslogd-listfiles.8
 	exeinto /etc/cron.daily
 	newexe ${FILESDIR}/syslog-cron syslog.cron
-	dodoc ANNOUNCE CHANGES COPYING MANIFEST NEWS README.1st README.linux
+	dodoc ANNOUNCE CHANGES MANIFEST NEWS README.1st README.linux
 	dodoc ${FILESDIR}/syslog.conf
 	insinto /etc
 	doins ${FILESDIR}/syslog.conf
diff --git a/app-admin/sysklogd/sysklogd-1.4.1-r7.ebuild b/app-admin/sysklogd/sysklogd-1.4.1-r7.ebuild
index c96c3cdd9311..b6968f53d923 100644
--- a/app-admin/sysklogd/sysklogd-1.4.1-r7.ebuild
+++ b/app-admin/sysklogd/sysklogd-1.4.1-r7.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/app-admin/sysklogd/sysklogd-1.4.1-r7.ebuild,v 1.7 2004/03/29 23:20:19 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysklogd/sysklogd-1.4.1-r7.ebuild,v 1.8 2004/05/31 19:21:33 vapier Exp $
 
 inherit eutils
 
@@ -8,13 +8,13 @@ DESCRIPTION="Standard log daemons"
 HOMEPAGE="http://www.infodrom.org/projects/sysklogd/"
 SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/daemons/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="BSD"
-KEYWORDS="x86 ppc sparc alpha hppa mips"
+SLOT="0"
+KEYWORDS="x86 ppc sparc mips alpha hppa"
+IUSE=""
 
 DEPEND="virtual/glibc"
 RDEPEND="dev-lang/perl sys-apps/debianutils"
-
 PROVIDE="virtual/logger"
 
 src_unpack() {
@@ -37,7 +37,7 @@ src_install() {
 	doman *.[1-9] ${FILESDIR}/syslogd-listfiles.8
 	exeinto /etc/cron.daily
 	newexe ${FILESDIR}/syslog-cron syslog.cron
-	dodoc ANNOUNCE CHANGES COPYING MANIFEST NEWS README.1st README.linux
+	dodoc ANNOUNCE CHANGES MANIFEST NEWS README.1st README.linux
 	dodoc ${FILESDIR}/syslog.conf
 	insinto /etc
 	doins ${FILESDIR}/syslog.conf
diff --git a/app-admin/sysklogd/sysklogd-1.4.1-r8.ebuild b/app-admin/sysklogd/sysklogd-1.4.1-r8.ebuild
index 38d774484590..d2bbc792575b 100644
--- a/app-admin/sysklogd/sysklogd-1.4.1-r8.ebuild
+++ b/app-admin/sysklogd/sysklogd-1.4.1-r8.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/app-admin/sysklogd/sysklogd-1.4.1-r8.ebuild,v 1.6 2004/03/29 23:20:19 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysklogd/sysklogd-1.4.1-r8.ebuild,v 1.7 2004/05/31 19:21:33 vapier Exp $
 
 inherit eutils
 
@@ -8,13 +8,13 @@ DESCRIPTION="Standard log daemons"
 HOMEPAGE="http://www.infodrom.org/projects/sysklogd/"
 SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/daemons/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa"
+IUSE=""
 
 DEPEND="virtual/glibc"
 RDEPEND="dev-lang/perl sys-apps/debianutils"
-
 PROVIDE="virtual/logger"
 
 src_unpack() {
@@ -36,7 +36,7 @@ src_install() {
 	doman *.[1-9] ${FILESDIR}/syslogd-listfiles.8
 	exeinto /etc/cron.daily
 	newexe ${FILESDIR}/syslog-cron syslog.cron
-	dodoc ANNOUNCE CHANGES COPYING MANIFEST NEWS README.1st README.linux
+	dodoc ANNOUNCE CHANGES MANIFEST NEWS README.1st README.linux
 	dodoc ${FILESDIR}/syslog.conf
 	insinto /etc
 	doins ${FILESDIR}/syslog.conf
diff --git a/app-admin/sysklogd/sysklogd-1.4.1-r9.ebuild b/app-admin/sysklogd/sysklogd-1.4.1-r9.ebuild
index 48a437aba968..6947bb0ec05b 100644
--- a/app-admin/sysklogd/sysklogd-1.4.1-r9.ebuild
+++ b/app-admin/sysklogd/sysklogd-1.4.1-r9.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/app-admin/sysklogd/sysklogd-1.4.1-r9.ebuild,v 1.6 2004/03/29 23:20:19 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysklogd/sysklogd-1.4.1-r9.ebuild,v 1.7 2004/05/31 19:21:33 vapier Exp $
 
 inherit eutils
 
@@ -8,13 +8,13 @@ DESCRIPTION="Standard log daemons"
 HOMEPAGE="http://www.infodrom.org/projects/sysklogd/"
 SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/daemons/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ia64"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa ia64"
+IUSE=""
 
 DEPEND="virtual/glibc"
 RDEPEND="dev-lang/perl sys-apps/debianutils"
-
 PROVIDE="virtual/logger"
 
 src_unpack() {
@@ -36,7 +36,7 @@ src_install() {
 	doman *.[1-9] ${FILESDIR}/syslogd-listfiles.8
 	exeinto /etc/cron.daily
 	newexe ${FILESDIR}/syslog-cron syslog.cron
-	dodoc ANNOUNCE CHANGES COPYING MANIFEST NEWS README.1st README.linux
+	dodoc ANNOUNCE CHANGES MANIFEST NEWS README.1st README.linux
 	dodoc ${FILESDIR}/syslog.conf
 	insinto /etc
 	doins ${FILESDIR}/syslog.conf
diff --git a/app-admin/syslog-ng/syslog-ng-1.6.0_rc3-r1.ebuild b/app-admin/syslog-ng/syslog-ng-1.6.0_rc3-r1.ebuild
index 5cc73116318d..72584c0a1464 100644
--- a/app-admin/syslog-ng/syslog-ng-1.6.0_rc3-r1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-1.6.0_rc3-r1.ebuild
@@ -1,28 +1,26 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-1.6.0_rc3-r1.ebuild,v 1.11 2004/02/24 08:44:24 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-1.6.0_rc3-r1.ebuild,v 1.12 2004/05/31 19:21:33 vapier Exp $
 
-IUSE="tcpd"
 # The release candidates are named syslog-ng-1.6.0rc1 for example
 MY_P=${P/_/}
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="syslog replacement with advanced filtering features"
-SRC_URI="http://www.balabit.com/downloads/syslog-ng/${PV%.*}/src/old/${MY_P}.tar.gz"
 HOMEPAGE="http://www.balabit.com/products/syslog_ng/"
+SRC_URI="http://www.balabit.com/downloads/syslog-ng/${PV%.*}/src/old/${MY_P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha hppa mips amd64 ia64"
+SLOT="0"
+KEYWORDS="x86 ppc sparc mips alpha hppa amd64 ia64"
+IUSE="tcpd"
 
 RDEPEND=">=dev-libs/libol-0.3.9
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
 DEPEND="${RDEPEND}
 	sys-devel/flex"
-
 PROVIDE="virtual/logger"
 
 src_unpack() {
-
 	unpack ${A}
 	cd ${S}/doc/sgml
 	tar xfz syslog-ng.html.tar.gz
@@ -44,7 +42,7 @@ src_install() {
 #	rm -rf ${D}/usr/share/man
 #	doman doc/{syslog-ng.8,syslog-ng.conf.5}
 
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS PORTS README
+	dodoc AUTHORS ChangeLog INSTALL NEWS PORTS README
 	dodoc doc/{syslog-ng.conf.sample,syslog-ng.conf.demo,stresstest.sh}
 	dodoc doc/sgml/{syslog-ng.dvi,syslog-ng.ps,syslog-ng.sgml,syslog-ng.txt}
 	dodoc contrib/syslog2ng
diff --git a/app-admin/systemimager-boot-bin/systemimager-boot-bin-3.0.1.ebuild b/app-admin/systemimager-boot-bin/systemimager-boot-bin-3.0.1.ebuild
index 2ef274a932d8..c6d9baac34ae 100644
--- a/app-admin/systemimager-boot-bin/systemimager-boot-bin-3.0.1.ebuild
+++ b/app-admin/systemimager-boot-bin/systemimager-boot-bin-3.0.1.ebuild
@@ -1,25 +1,27 @@
-# 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/app-admin/systemimager-boot-bin/systemimager-boot-bin-3.0.1.ebuild,v 1.1 2003/10/17 12:04:36 bass Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/systemimager-boot-bin/systemimager-boot-bin-3.0.1.ebuild,v 1.2 2004/05/31 19:21:33 vapier Exp $
 
 MY_P="systemimager-i386boot-standard-3.0.1-4.noarch"
 
-S=${WORKDIR}
 DESCRIPTION="System imager boot-i386. Software that automates Linux installs, software distribution, and production deployment."
 HOMEPAGE="http://www.systemimager.org/"
 SRC_URI="mirror://sourceforge/systemimager/${MY_P}.rpm"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86"
+IUSE=""
 
 DEPEND="app-arch/rpm2targz"
-RDPEND="${DEPEND}
-		app-admin/systemimager-server-bin"
+RDEPEND="${DEPEND}
+	app-admin/systemimager-server-bin"
+
+S=${WORKDIR}
 
 src_unpack() {
-	rpm2targz ${DISTDIR}/${MY_P}.rpm
-	tar zxf ${WORKDIR}/${MY_P}.tar.gz
+	rpm2targz ${DISTDIR}/${MY_P}.rpm || die
+	tar zxf ${WORKDIR}/${MY_P}.tar.gz || die
 }
 
 src_compile() {
@@ -27,10 +29,6 @@ src_compile() {
 }
 
 src_install() {
-
-#stuff in /usr
-	mkdir -p ${D}/usr/share/systemimager/boot/i386/standard
 	insinto /usr/share/systemimager/boot/i386/standard
-	doins usr/share/systemimager/boot/i386/standard/*
+	doins usr/share/systemimager/boot/i386/standard/* || die
 }
-
diff --git a/app-admin/systemimager-client-bin/systemimager-client-bin-3.0.1.ebuild b/app-admin/systemimager-client-bin/systemimager-client-bin-3.0.1.ebuild
index e4cd8eb25bf9..7b07530ead97 100644
--- a/app-admin/systemimager-client-bin/systemimager-client-bin-3.0.1.ebuild
+++ b/app-admin/systemimager-client-bin/systemimager-client-bin-3.0.1.ebuild
@@ -1,27 +1,29 @@
-# 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/app-admin/systemimager-client-bin/systemimager-client-bin-3.0.1.ebuild,v 1.5 2004/02/29 15:27:12 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/systemimager-client-bin/systemimager-client-bin-3.0.1.ebuild,v 1.6 2004/05/31 19:21:33 vapier Exp $
 
 MY_P="systemimager-client-3.0.1-4.noarch"
 
-S=${WORKDIR}
 DESCRIPTION="System imager client. Software that automates Linux installs, software distribution, and production deployment."
 HOMEPAGE="http://www.systemimager.org/"
 SRC_URI="mirror://sourceforge/systemimager/${MY_P}.rpm"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86"
+IUSE=""
 
 DEPEND="app-arch/rpm2targz
 	app-admin/systemimager-common-bin"
 RDEPEND="${DEPEND}
-		dev-perl/AppConfig
-		app-admin/systemconfigurator"
+	dev-perl/AppConfig
+	app-admin/systemconfigurator"
+
+S=${WORKDIR}
 
 src_unpack() {
-	rpm2targz ${DISTDIR}/${MY_P}.rpm
-	tar zxf ${WORKDIR}/${MY_P}.tar.gz
+	rpm2targz ${DISTDIR}/${MY_P}.rpm || die
+	tar zxf ${WORKDIR}/${MY_P}.tar.gz || die
 }
 
 src_compile() {
@@ -29,16 +31,11 @@ src_compile() {
 }
 
 src_install() {
-
-#stuff in /usr
-	dosbin usr/sbin/{prepareclient,updateclient}
+	dosbin usr/sbin/{prepareclient,updateclient} || die
 	doman usr/share/man/man8/*.gz
 	dodoc usr/share/doc/systemimager-client-3.0.1/*
 
-#stuff in etc
-	mkdir -p ${D}/etc/system/imager
 	insinto /etc/systemimager
-	doins	etc/systemimager/{client.conf,updateclient.local.exclude}
+	doins etc/systemimager/{client.conf,updateclient.local.exclude} || die
 
 }
-
diff --git a/app-admin/systemimager-common-bin/systemimager-common-bin-3.0.1.ebuild b/app-admin/systemimager-common-bin/systemimager-common-bin-3.0.1.ebuild
index 8d8102264564..ef4ea3001fa7 100644
--- a/app-admin/systemimager-common-bin/systemimager-common-bin-3.0.1.ebuild
+++ b/app-admin/systemimager-common-bin/systemimager-common-bin-3.0.1.ebuild
@@ -1,27 +1,27 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/systemimager-common-bin/systemimager-common-bin-3.0.1.ebuild,v 1.5 2004/02/29 15:27:12 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/systemimager-common-bin/systemimager-common-bin-3.0.1.ebuild,v 1.6 2004/05/31 19:21:33 vapier Exp $
 
 MY_P="systemimager-common-3.0.1-4.noarch"
 
-S=${WORKDIR}
 DESCRIPTION="System imager common."
 HOMEPAGE="http://www.systemimager.org/"
 SRC_URI="mirror://sourceforge/systemimager/${MY_P}.rpm"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86"
+IUSE=""
 
 DEPEND="app-arch/rpm2targz"
-
-
 RDEPEND="${DEPEND}
 	app-admin/systemconfigurator"
 
+S=${WORKDIR}
+
 src_unpack() {
-	rpm2targz ${DISTDIR}/${MY_P}.rpm
-	tar zxf ${WORKDIR}/${MY_P}.tar.gz
+	rpm2targz ${DISTDIR}/${MY_P}.rpm || die
+	tar zxf ${WORKDIR}/${MY_P}.tar.gz || die
 }
 
 src_compile() {
@@ -29,12 +29,9 @@ src_compile() {
 }
 
 src_install() {
-	dobin usr/bin/lsimage
-	mkdir -p ${D}/usr/lib/systemimager/perl/SystemImager/
+	dobin usr/bin/lsimage || die
 	insinto /usr/lib/systemimager/perl/SystemImager/
-	doins usr/lib/systemimager/perl/SystemImager/{Common,Config}.pm
+	doins usr/lib/systemimager/perl/SystemImager/{Common,Config}.pm || die
 	doman usr/share/man/man5/autoinstallscript.conf.5.gz
 	doman usr/share/man/man8/lsimage.8.gz
-
 }
-
diff --git a/app-admin/systemimager-server-bin/systemimager-server-bin-3.0.1.ebuild b/app-admin/systemimager-server-bin/systemimager-server-bin-3.0.1.ebuild
index 13bd437f3151..406f60187963 100644
--- a/app-admin/systemimager-server-bin/systemimager-server-bin-3.0.1.ebuild
+++ b/app-admin/systemimager-server-bin/systemimager-server-bin-3.0.1.ebuild
@@ -1,29 +1,31 @@
-# 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/app-admin/systemimager-server-bin/systemimager-server-bin-3.0.1.ebuild,v 1.3 2004/02/27 18:29:55 bass Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/systemimager-server-bin/systemimager-server-bin-3.0.1.ebuild,v 1.4 2004/05/31 19:21:33 vapier Exp $
 
 MY_P="systemimager-server-3.0.1-4.noarch"
 
-S=${WORKDIR}
 DESCRIPTION="System imager server. Software that automates Linux installs, software distribution, and production deployment."
 HOMEPAGE="http://www.systemimager.org/"
 SRC_URI="mirror://sourceforge/systemimager/${MY_P}.rpm"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86"
-
+IUSE=""
 
 DEPEND="app-arch/rpm2targz
-		app-admin/systemimager-common-bin
-		app-admin/systemimager-boot-bin
-		app-admin/systemconfigurator"
+	app-admin/systemimager-common-bin
+	app-admin/systemimager-boot-bin
+	app-admin/systemconfigurator"
 RDEPEND="${DEPEND}
-		dev-perl/AppConfig
-		dev-perl/XML-Simple"
+	dev-perl/AppConfig
+	dev-perl/XML-Simple"
+
+S=${WORKDIR}
+
 src_unpack() {
-	rpm2targz ${DISTDIR}/${MY_P}.rpm
-	tar zxf ${WORKDIR}/${MY_P}.tar.gz
+	rpm2targz ${DISTDIR}/${MY_P}.rpm || die
+	tar zxf ${WORKDIR}/${MY_P}.tar.gz || die
 }
 
 src_compile() {
@@ -31,33 +33,27 @@ src_compile() {
 }
 
 src_install() {
-
-#stuff in /usr
-	dobin usr/bin/{mkautoinstallcd,mkautoinstalldiskette}
-	dodir -p /usr/lib/systemimager/perl/SystemImager/
+	dobin usr/bin/{mkautoinstallcd,mkautoinstalldiskette} || die
+	dodir /usr/lib/systemimager/perl/SystemImager/
 	insinto /usr/lib/systemimager/perl/SystemImager/
-	doins usr/lib/systemimager/perl/SystemImager/Server.pm
-	dosbin usr/sbin/{addclients,cpimage,getimage,mkautoinstallscript,mkbootserver,mkclientnetboot,mkdhcpserver,mkdhcpstatic,mkrsyncd_conf,mvimage,netbootmond,pushupdate,rmimage}
+	doins usr/lib/systemimager/perl/SystemImager/Server.pm || die
+	dosbin usr/sbin/{addclients,cpimage,getimage,mkautoinstallscript,mkbootserver,mkclientnetboot,mkdhcpserver,mkdhcpstatic,mkrsyncd_conf,mvimage,netbootmond,pushupdate,rmimage} || die
 	doman usr/share/man/man5/*.gz
 	doman usr/share/man/man8/*.gz
 	dodoc usr/share/doc/systemimager-server-3.0.1/*
 
-#stuff in /var
-	dodir -p /var/lib/systemimager/{images,overrides,scripts}
+	dodir /var/lib/systemimager/{images,overrides,scripts}
 	insinto /var/lib/systemimager/images
-	doins var/lib/systemimager/images/*
-	dodir -p /var/log/systemimager
+	doins var/lib/systemimager/images/* || die
+	dodir /var/log/systemimager
 
-#stuff in etc
 	exeinto /etc/init.d
-	doexe	etc/init.d/*
-	dodir -p /etc/system/imager/{pxelinux.cfg,rsync_stubs}
+	doexe etc/init.d/* || die
+	dodir /etc/system/imager/{pxelinux.cfg,rsync_stubs}
 	insinto /etc/systemimager/pxelinux.cfg
-	doins	etc/systemimager/pxelinux.cfg/*
+	doins etc/systemimager/pxelinux.cfg/* || die
 	insinto /etc/systemimager/rsync_stubs
-	doins	etc/systemimager/rsync_stubs/*
+	doins etc/systemimager/rsync_stubs/* || die
 	insinto /etc/systemimager
-	doins	etc/systemimager/systemimager.conf
-
+	doins etc/systemimager/systemimager.conf || die
 }
-
diff --git a/app-admin/torsmo/torsmo-0.13.ebuild b/app-admin/torsmo/torsmo-0.13.ebuild
index ee095e617ff5..9caabf868bbf 100644
--- a/app-admin/torsmo/torsmo-0.13.ebuild
+++ b/app-admin/torsmo/torsmo-0.13.ebuild
@@ -1,19 +1,18 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/torsmo/torsmo-0.13.ebuild,v 1.1 2004/05/07 16:05:49 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/torsmo/torsmo-0.13.ebuild,v 1.2 2004/05/31 19:21:33 vapier Exp $
 
-DESCRIPTION="Torsmo is a system monitor that sits in the corner of your desktop."
+DESCRIPTION="system monitor that sits in the corner of your desktop"
 HOMEPAGE="http://torsmo.sourceforge.net/"
 SRC_URI="mirror://sourceforge/torsmo/${P}.tar.gz"
-RESTRICT="nomirror"
-IUSE=""
-SLOT="0"
+
 LICENSE="BSD"
+SLOT="0"
 KEYWORDS="~x86"
+IUSE=""
 
 RDEPEND="virtual/glibc
 	virtual/x11"
-
 DEPEND="${RDEPEND}
 	>=sys-devel/automake-1.4
 	sys-devel/autoconf
@@ -21,18 +20,12 @@ DEPEND="${RDEPEND}
 	sys-apps/sed
 	sys-devel/gcc"
 
-src_compile() {
-	econf || die "Configure died"
-	emake || die "make died"
-}
-
 src_install() {
 	emake DESTDIR=${D} install || die "make install failed"
-	dodoc ChangeLog AUTHORS README NEWS COPYING torsmorc.sample
+	dodoc ChangeLog AUTHORS README NEWS torsmorc.sample
 }
 
 pkg_postinst() {
-
 	einfo 'default configuration file is "~/.torsmorc"'
 	einfo "you can find a sample configuration file in"
 	einfo "/usr/share/doc/${PF}/torsmorc.sample.gz"
diff --git a/app-admin/torsmo/torsmo-0.14.ebuild b/app-admin/torsmo/torsmo-0.14.ebuild
index 83ecddf8a62d..b4d74b598852 100644
--- a/app-admin/torsmo/torsmo-0.14.ebuild
+++ b/app-admin/torsmo/torsmo-0.14.ebuild
@@ -1,19 +1,18 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/torsmo/torsmo-0.14.ebuild,v 1.2 2004/05/08 17:08:41 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/torsmo/torsmo-0.14.ebuild,v 1.3 2004/05/31 19:21:33 vapier Exp $
 
-DESCRIPTION="Torsmo is a system monitor that sits in the corner of your desktop."
+DESCRIPTION="system monitor that sits in the corner of your desktop"
 HOMEPAGE="http://torsmo.sourceforge.net/"
 SRC_URI="mirror://sourceforge/torsmo/${P}.tar.gz"
-RESTRICT="nomirror"
-IUSE=""
-SLOT="0"
+
 LICENSE="BSD"
+SLOT="0"
 KEYWORDS="~x86 ~ppc"
+IUSE=""
 
 RDEPEND="virtual/glibc
 	virtual/x11"
-
 DEPEND="${RDEPEND}
 	>=sys-devel/automake-1.4
 	sys-devel/autoconf
@@ -21,18 +20,12 @@ DEPEND="${RDEPEND}
 	sys-apps/sed
 	sys-devel/gcc"
 
-src_compile() {
-	econf || die "Configure died"
-	emake || die "make died"
-}
-
 src_install() {
 	emake DESTDIR=${D} install || die "make install failed"
-	dodoc ChangeLog AUTHORS README NEWS COPYING torsmorc.sample
+	dodoc ChangeLog AUTHORS README NEWS torsmorc.sample
 }
 
 pkg_postinst() {
-
 	einfo 'default configuration file is "~/.torsmorc"'
 	einfo "you can find a sample configuration file in"
 	einfo "/usr/share/doc/${PF}/torsmorc.sample.gz"
diff --git a/app-admin/torsmo/torsmo-0.16.ebuild b/app-admin/torsmo/torsmo-0.16.ebuild
index 1ba8c46d6340..c61fd0115e81 100644
--- a/app-admin/torsmo/torsmo-0.16.ebuild
+++ b/app-admin/torsmo/torsmo-0.16.ebuild
@@ -1,19 +1,18 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/torsmo/torsmo-0.16.ebuild,v 1.1 2004/05/14 21:03:57 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/torsmo/torsmo-0.16.ebuild,v 1.2 2004/05/31 19:21:33 vapier Exp $
 
-DESCRIPTION="Torsmo is a system monitor that sits in the corner of your desktop."
+DESCRIPTION="system monitor that sits in the corner of your desktop"
 HOMEPAGE="http://torsmo.sourceforge.net/"
 SRC_URI="mirror://sourceforge/torsmo/${P}.tar.gz"
-RESTRICT="nomirror"
-IUSE=""
-SLOT="0"
+
 LICENSE="BSD"
+SLOT="0"
 KEYWORDS="~x86 ~ppc"
+IUSE=""
 
 RDEPEND="virtual/glibc
 	virtual/x11"
-
 DEPEND="${RDEPEND}
 	>=sys-devel/automake-1.4
 	sys-devel/autoconf
@@ -21,18 +20,12 @@ DEPEND="${RDEPEND}
 	sys-apps/sed
 	sys-devel/gcc"
 
-src_compile() {
-	econf || die "Configure died"
-	emake || die "make died"
-}
-
 src_install() {
 	emake DESTDIR=${D} install || die "make install failed"
-	dodoc ChangeLog AUTHORS README NEWS COPYING torsmorc.sample
+	dodoc ChangeLog AUTHORS README NEWS torsmorc.sample
 }
 
 pkg_postinst() {
-
 	einfo 'default configuration file is "~/.torsmorc"'
 	einfo "you can find a sample configuration file in"
 	einfo "/usr/share/doc/${PF}/torsmorc.sample.gz"
diff --git a/app-admin/torsmo/torsmo-0.17.ebuild b/app-admin/torsmo/torsmo-0.17.ebuild
index d9cdf1b182a1..e7720b652141 100644
--- a/app-admin/torsmo/torsmo-0.17.ebuild
+++ b/app-admin/torsmo/torsmo-0.17.ebuild
@@ -1,19 +1,18 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/torsmo/torsmo-0.17.ebuild,v 1.2 2004/05/30 12:02:16 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/torsmo/torsmo-0.17.ebuild,v 1.3 2004/05/31 19:21:33 vapier Exp $
 
-DESCRIPTION="Torsmo is a system monitor that sits in the corner of your desktop."
+DESCRIPTION="system monitor that sits in the corner of your desktop"
 HOMEPAGE="http://torsmo.sourceforge.net/"
 SRC_URI="mirror://sourceforge/torsmo/${P}.tar.gz"
-RESTRICT="nomirror"
-IUSE=""
-SLOT="0"
+
 LICENSE="BSD"
+SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
+IUSE=""
 
 RDEPEND="virtual/glibc
 	virtual/x11"
-
 DEPEND="${RDEPEND}
 	>=sys-devel/automake-1.4
 	sys-devel/autoconf
@@ -21,18 +20,12 @@ DEPEND="${RDEPEND}
 	sys-apps/sed
 	sys-devel/gcc"
 
-src_compile() {
-	econf || die "Configure died"
-	emake || die "make died"
-}
-
 src_install() {
 	emake DESTDIR=${D} install || die "make install failed"
-	dodoc ChangeLog AUTHORS README NEWS COPYING torsmorc.sample
+	dodoc ChangeLog AUTHORS README NEWS torsmorc.sample
 }
 
 pkg_postinst() {
-
 	einfo 'default configuration file is "~/.torsmorc"'
 	einfo "you can find a sample configuration file in"
 	einfo "/usr/share/doc/${PF}/torsmorc.sample.gz"
diff --git a/app-admin/tripwire/tripwire-2.3.1.2.ebuild b/app-admin/tripwire/tripwire-2.3.1.2.ebuild
index b9f29ad0925f..31f068a41f23 100644
--- a/app-admin/tripwire/tripwire-2.3.1.2.ebuild
+++ b/app-admin/tripwire/tripwire-2.3.1.2.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/tripwire-2.3.1.2.ebuild,v 1.10 2004/03/27 20:12:16 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/tripwire-2.3.1.2.ebuild,v 1.11 2004/05/31 19:21:33 vapier Exp $
 
 inherit eutils flag-o-matic
 
-IUSE=""
 TW_VER="2.3.1-2"
 DESCRIPTION="Open Source File Integrity Checker and IDS"
 HOMEPAGE="http://www.tripwire.org/"
@@ -14,6 +13,8 @@ SRC_URI="mirror://sourceforge/tripwire/tripwire-${TW_VER}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 -alpha"
+IUSE=""
+
 DEPEND="virtual/glibc
 	dev-util/patchutils
 	sys-devel/automake
@@ -78,8 +79,8 @@ src_install() {
 	exeinto /etc/cron.daily
 	doexe ${FILESDIR}/tripwire.cron
 
-	dodoc README Release_Notes ChangeLog COPYING policy/policyguide.txt TRADEMARK \
-	${FILESDIR}/tripwire.gif ${FILESDIR}/tripwire.txt
+	dodoc README Release_Notes ChangeLog policy/policyguide.txt TRADEMARK \
+		${FILESDIR}/tripwire.gif ${FILESDIR}/tripwire.txt
 
 	insinto /etc/tripwire
 	doins ${FILESDIR}/twcfg.txt ${FILESDIR}/twpol.txt
diff --git a/app-admin/usbview/usbview-1.0-r1.ebuild b/app-admin/usbview/usbview-1.0-r1.ebuild
index 806cf1917b7c..68b33fc55923 100644
--- a/app-admin/usbview/usbview-1.0-r1.ebuild
+++ b/app-admin/usbview/usbview-1.0-r1.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/usbview/usbview-1.0-r1.ebuild,v 1.16 2004/04/26 15:22:55 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/usbview/usbview-1.0-r1.ebuild,v 1.17 2004/05/31 19:21:33 vapier Exp $
 
 DESCRIPTION="Display the topology of devices on the USB bus"
-SRC_URI="http://www.kroah.com/linux-usb/${P}.tar.gz"
 HOMEPAGE="http://www.kroah.com/linux-usb/"
+SRC_URI="http://www.kroah.com/linux-usb/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc sparc amd64"
+IUSE=""
 
 DEPEND="=x11-libs/gtk+-1.2*"
 
@@ -19,5 +20,5 @@ src_compile() {
 
 src_install() {
 	make DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog COPYING NEWS README TODO
+	dodoc AUTHORS ChangeLog NEWS README TODO
 }
diff --git a/app-admin/verynice/verynice-1.1.ebuild b/app-admin/verynice/verynice-1.1.ebuild
index d74bd802392d..3f6d0be0ad5d 100644
--- a/app-admin/verynice/verynice-1.1.ebuild
+++ b/app-admin/verynice/verynice-1.1.ebuild
@@ -1,15 +1,17 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/verynice/verynice-1.1.ebuild,v 1.3 2004/02/29 23:07:29 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/verynice/verynice-1.1.ebuild,v 1.4 2004/05/31 19:21:33 vapier Exp $
 
-S=${WORKDIR}/${PN}
 DESCRIPTION="A tool for dynamically adjusting the nice-level of processes"
 HOMEPAGE="http://www.tam.cornell.edu/~sdh4/verynice/"
 SRC_URI="http://www.tam.cornell.edu/~sdh4/verynice/down/${P}.tar.gz"
 
-KEYWORDS="x86"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="x86"
+IUSE=""
+
+S=${WORKDIR}/${PN}
 
 src_compile() {
 	emake RPM_BUILD_ROOT=${D} PREFIX=/usr || die "emake failed"
@@ -17,20 +19,19 @@ src_compile() {
 
 src_install(){
 	# the install looks for this directory.
-	dodir /etc/init.d                            || die "dodir failed"
-
-	einstall RPM_BUILD_ROOT=${D} PREFIX=/usr     || die
+	dodir /etc/init.d
+	einstall RPM_BUILD_ROOT=${D} PREFIX=/usr || die
 
 	# odd, the config file is installed +x
-	fperms a-x /etc/verynice.conf                || die "fperms failed"
+	fperms a-x /etc/verynice.conf
 
 	# make the doc install Gentooish
-	mv ${D}/usr/share/doc/${P}/* ${T}            || die "mv failed"
-	dodoc ${T}/{CHANGELOG,README*}               || die "dodoc failed"
-	dohtml ${T}/*                                || die "dohtml failed"
+	mv ${D}/usr/share/doc/${P}/* ${T} || die "mv failed"
+	dodoc ${T}/{CHANGELOG,README*}
+	dohtml ${T}/*
 	# html references the COPYING file.
-	cp ${T}/COPYING ${D}/usr/share/doc/${P}/html || die "cp failed"
+	cp ${T}/COPYING ${D}/usr/share/doc/${P}/html
 
 	exeinto /etc/init.d
-	doexe ${FILESDIR}/verynice                   || die "doexe failed"
+	doexe ${FILESDIR}/verynice || die "doexe failed"
 }
diff --git a/app-admin/webalizer/webalizer-2.01.10-r4.ebuild b/app-admin/webalizer/webalizer-2.01.10-r4.ebuild
index 0511874e30c0..b7dd3673527c 100644
--- a/app-admin/webalizer/webalizer-2.01.10-r4.ebuild
+++ b/app-admin/webalizer/webalizer-2.01.10-r4.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r4.ebuild,v 1.8 2004/02/02 03:39:51 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r4.ebuild,v 1.9 2004/05/31 19:21:33 vapier Exp $
 
 MY_P=${P/.10/-10}
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="Webserver log file analyzer"
-SRC_URI="ftp://ftp.mrunix.net/pub/webalizer/${MY_P}-src.tar.bz2"
 HOMEPAGE="http://www.mrunix.net/webalizer/"
+SRC_URI="ftp://ftp.mrunix.net/pub/webalizer/${MY_P}-src.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc sparc hppa ~amd64"
+IUSE=""
 
 DEPEND="=sys-libs/db-1*
 	>=sys-libs/zlib-1.1.4
@@ -56,12 +57,12 @@ src_install() {
 	use apache2 && insinto /etc/apache2/conf/modules.d
 	use apache2 && newins ${FILESDIR}/${PV}/apache.webalizer 55_webalizer.conf
 
-	dodoc README* CHANGES COPYING Copyright sample.conf
+	dodoc README* CHANGES Copyright sample.conf
 	dodir /var/www/webalizer
 }
 
-pkg_postinst(){
-	if [ -n "`use apache2`" ]; then
+pkg_postinst() {
+	if use apache2 ; then
 	einfo "to update your apache.conf just type"
 	einfo "echo \"Include  conf/addon-modules/webalizer.conf\" \
 		>> /etc/apache/conf/apache.conf"
diff --git a/app-admin/webalizer/webalizer-2.01.10-r5.ebuild b/app-admin/webalizer/webalizer-2.01.10-r5.ebuild
index 0b04dc2eb582..fb640a1297dd 100644
--- a/app-admin/webalizer/webalizer-2.01.10-r5.ebuild
+++ b/app-admin/webalizer/webalizer-2.01.10-r5.ebuild
@@ -1,21 +1,21 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r5.ebuild,v 1.3 2004/05/24 13:33:03 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r5.ebuild,v 1.4 2004/05/31 19:21:33 vapier Exp $
 
 inherit eutils
 
-IUSE="geoip"
 MY_PV=${PV/.10/-10}
 MY_P=${PN}-${MY_PV}
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="Webserver log file analyzer"
+HOMEPAGE="http://www.mrunix.net/webalizer/"
 SRC_URI="ftp://ftp.mrunix.net/pub/webalizer/${MY_P}-src.tar.bz2
 	geoip? ( http://sysd.org/proj/geolizer_${MY_PV}-patch.20040216.tar.bz2 )"
-HOMEPAGE="http://www.mrunix.net/webalizer/"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~hppa ~amd64 ~alpha"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
+IUSE="geoip"
 
 DEPEND="=sys-libs/db-1*
 	>=sys-libs/zlib-1.1.4
@@ -68,7 +68,7 @@ src_install() {
 	use apache2 && insinto /etc/apache2/conf/modules.d
 	use apache2 && newins ${FILESDIR}/${PV}/apache.webalizer 55_webalizer.conf
 
-	dodoc README* CHANGES COPYING Copyright sample.conf
+	dodoc README* CHANGES Copyright sample.conf
 	dodir /var/www/webalizer
 }
 
diff --git a/app-admin/whowatch/whowatch-1.5.2.ebuild b/app-admin/whowatch/whowatch-1.5.2.ebuild
index 4c70a3d42358..a12b1b75c8e8 100644
--- a/app-admin/whowatch/whowatch-1.5.2.ebuild
+++ b/app-admin/whowatch/whowatch-1.5.2.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/whowatch/whowatch-1.5.2.ebuild,v 1.19 2004/04/26 15:23:42 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/whowatch/whowatch-1.5.2.ebuild,v 1.20 2004/05/31 19:21:33 vapier Exp $
 
 inherit eutils
 
-DESCRIPTION="interactive who-like program that displays information about users currently logged on in real time."
-SRC_URI="http://wizard.ae.krakow.pl/~mike/download/${P}.tar.gz"
+DESCRIPTION="interactive who-like program that displays information about users currently logged on in real time"
 HOMEPAGE="http://wizard.ae.krakow.pl/~mike/"
+SRC_URI="http://wizard.ae.krakow.pl/~mike/download/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc sparc amd64"
+IUSE=""
 
 DEPEND="sys-libs/ncurses"
 
@@ -27,5 +28,5 @@ src_compile() {
 
 src_install() {
 	einstall
-	dodoc AUTHORS ChangeLog COPYING KEYS NEWS README TODO VERSION
+	dodoc AUTHORS ChangeLog KEYS NEWS README TODO VERSION
 }
diff --git a/app-admin/xsu/xsu-0.2.3.ebuild b/app-admin/xsu/xsu-0.2.3.ebuild
index d6746de84966..a36b49567f8f 100644
--- a/app-admin/xsu/xsu-0.2.3.ebuild
+++ b/app-admin/xsu/xsu-0.2.3.ebuild
@@ -1,36 +1,33 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/xsu/xsu-0.2.3.ebuild,v 1.10 2004/04/14 07:27:00 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/xsu/xsu-0.2.3.ebuild,v 1.11 2004/05/31 19:21:33 vapier Exp $
 
 DESCRIPTION="Interface for 'su - username -c command' in GNOME."
+HOMEPAGE="http://xsu.freax.eu.org/"
 SRC_URI="http://xsu.freax.eu.org/files/${P}.tar.gz"
-HOMEPAGE="http://xsu.freax.eu.org"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc sparc"
+IUSE=""
 
 DEPEND="=gnome-base/gnome-libs-1.4*
 	=x11-libs/gtk+-1.2*
 	=dev-libs/glib-1.2*"
-
 RDEPEND=""
 
 src_compile() {
-
 	# xsu uses its own custom configure script with unflexible Makefiles
 	./configure \
 		--prefix=/usr \
 		--man-base=/usr/share/man \
 		--doc-path=/usr/share/doc || die
-
 	make CC="gcc ${CFLAGS}" || die
-
 }
 
 src_install() {
-	dobin bin/xsu
+	dobin bin/xsu || die
 	doman doc/man/xsu.8
-	dodoc AUTHORS CHANGELOG COPYING INSTALL README
+	dodoc AUTHORS CHANGELOG INSTALL README
 	dohtml -r doc
 }
diff --git a/app-admin/xsu2/xsu2-0.2.5.ebuild b/app-admin/xsu2/xsu2-0.2.5.ebuild
index 966354e0dc87..5b02f5a5d6b4 100644
--- a/app-admin/xsu2/xsu2-0.2.5.ebuild
+++ b/app-admin/xsu2/xsu2-0.2.5.ebuild
@@ -1,21 +1,21 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/xsu2/xsu2-0.2.5.ebuild,v 1.9 2004/04/28 21:10:07 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/xsu2/xsu2-0.2.5.ebuild,v 1.10 2004/05/31 19:21:33 vapier Exp $
 
 DESCRIPTION="Interface for 'su - username -c command' in GNOME2."
+HOMEPAGE="http://xsu.freax.eu.org/"
 SRC_URI="http://xsu.freax.eu.org/files/${P}.tar.gz"
-HOMEPAGE="http://xsu.freax.eu.org"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ~ppc amd64"
+IUSE=""
 
 RDEPEND="=gnome-base/libgnome-2*
 	=x11-libs/gtk+-2*
 	=dev-libs/glib-2*
 	=x11-libs/libzvt-2*
 	=gnome-base/libgnomeui-2*"
-
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
@@ -26,8 +26,8 @@ src_compile() {
 }
 
 src_install() {
-	dobin src/xsu
+	dobin src/xsu || die
 	doman doc/xsu.8
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
 	dohtml -r doc/xsu_*
 }