dont install stupid COPYING files among other things

33 files changed, 172 insertions, 188 deletions

diff --git a/app-arch/advancecomp/advancecomp-1.10.ebuild b/app-arch/advancecomp/advancecomp-1.10.ebuild
index 3f297946d0f3..4de121870b20 100644
--- a/app-arch/advancecomp/advancecomp-1.10.ebuild
+++ b/app-arch/advancecomp/advancecomp-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-arch/advancecomp/advancecomp-1.10.ebuild,v 1.3 2004/05/30 00:56:56 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/advancecomp/advancecomp-1.10.ebuild,v 1.4 2004/05/31 19:41:37 vapier Exp $
 
 inherit eutils
 
-IUSE="png"
-
 DESCRIPTION="Recompress ZIP, PNG and MNG using deflate 7-Zip, considerably improving compression"
 HOMEPAGE="http://advancemame.sourceforge.net/comp-readme.html"
 SRC_URI="mirror://sourceforge/advancemame/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~alpha ~ppc ~amd64"
-DEPEND="sys-libs/zlib app-arch/bzip2"
+KEYWORDS="~x86 ~ppc ~alpha ~amd64"
+IUSE="png"
+
+DEPEND="sys-libs/zlib
+	app-arch/bzip2"
 
 src_unpack() {
 	unpack ${A}
@@ -31,7 +32,7 @@ src_install() {
 	dobin advdef advzip
 	use png && dobin advpng advmng
 
-	dodoc HISTORY AUTHORS COPYING INSTALL README
+	dodoc HISTORY AUTHORS INSTALL README
 
 	doman doc/advdef.1 doc/advzip.1
 	use png && doman doc/advmng.1 doc/advpng.1
diff --git a/app-arch/advancecomp/advancecomp-1.9.ebuild b/app-arch/advancecomp/advancecomp-1.9.ebuild
index 7bb983804551..2a40b45c287c 100644
--- a/app-arch/advancecomp/advancecomp-1.9.ebuild
+++ b/app-arch/advancecomp/advancecomp-1.9.ebuild
@@ -1,21 +1,23 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/advancecomp/advancecomp-1.9.ebuild,v 1.3 2004/03/27 17:10:33 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/advancecomp/advancecomp-1.9.ebuild,v 1.4 2004/05/31 19:41:37 vapier Exp $
 
 inherit eutils
 
 DESCRIPTION="Recompress ZIP, PNG and MNG using deflate 7-Zip, considerably improving compression"
 HOMEPAGE="http://advancemame.sourceforge.net/comp-readme.html"
 SRC_URI="mirror://sourceforge/advancemame/${P}.tar.gz"
+
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="x86 ~alpha ~ppc"
+KEYWORDS="x86 ~ppc ~alpha"
 IUSE=""
-DEPEND="sys-libs/zlib app-arch/bzip2"
+
+DEPEND="sys-libs/zlib
+	app-arch/bzip2"
 
 src_unpack() {
 	unpack ${A}
-
 	# bzip2 support wont compile, heres a quick patch.
 	cd ${S}; epatch ${FILESDIR}/${PN}-bzip2-compile-plz-k-thx.diff
 }
@@ -26,7 +28,7 @@ src_compile() {
 }
 
 src_install() {
-	dobin advdef advmng advpng advzip
-	dodoc HISTORY AUTHORS COPYING INSTALL README
+	dobin advdef advmng advpng advzip || die
+	dodoc HISTORY AUTHORS INSTALL README
 	doman doc/advdef.1 doc/advmng.1 doc/advpng.1 doc/advzip.1
 }
diff --git a/app-arch/alien/alien-8.21-r1.ebuild b/app-arch/alien/alien-8.21-r1.ebuild
index 349158f4ad92..3eb7201d211f 100644
--- a/app-arch/alien/alien-8.21-r1.ebuild
+++ b/app-arch/alien/alien-8.21-r1.ebuild
@@ -1,23 +1,22 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/alien/alien-8.21-r1.ebuild,v 1.8 2004/01/27 20:14:53 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/alien/alien-8.21-r1.ebuild,v 1.9 2004/05/31 19:41:37 vapier Exp $
 
-S=${WORKDIR}/${PN}
-IUSE=""
 DESCRIPTION="Converts between the rpm, dpkg, stampede slp, and slackware tgz file formats"
-SRC_URI="http://kitenet.net/programs/alien/${PN}_${PV}.tar.gz"
 HOMEPAGE="http://kitenet.net/programs/alien/"
-LICENSE="LGPL-2.1"
-KEYWORDS="x86 ppc"
+SRC_URI="http://kitenet.net/programs/alien/${PN}_${PV}.tar.gz"
 
+LICENSE="LGPL-2.1"
 SLOT="0"
+KEYWORDS="x86 ppc"
+IUSE=""
 
 DEPEND=">=dev-lang/perl-5.6.0
 	>=app-arch/rpm-4.0.4-r4
 	>=app-arch/bzip2-1.0.2-r2
 	>=app-arch/dpkg-1.10.9"
 
-RDEPEND="${DEPEND}"
+S=${WORKDIR}/${PN}
 
 src_compile() {
 	perl Makefile.PL PREFIX="${D}/usr" || die "configuration failed"
@@ -30,9 +29,5 @@ src_install() {
 	    INSTALLMAN1DIR=${D}/usr/share/man/man1 \
 	    INSTALLMAN3DIR=${D}/usr/share/man/man3 \
 	    VARPREFIX=${D}
-	dodoc COPYING INSTALL README TODO
+	dodoc INSTALL README TODO
 }
-
-
-
-
diff --git a/app-arch/alien/alien-8.43.ebuild b/app-arch/alien/alien-8.43.ebuild
index 89be3f3f6440..fb56d69e97b6 100644
--- a/app-arch/alien/alien-8.43.ebuild
+++ b/app-arch/alien/alien-8.43.ebuild
@@ -1,23 +1,22 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/alien/alien-8.43.ebuild,v 1.1 2004/02/18 17:49:57 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/alien/alien-8.43.ebuild,v 1.2 2004/05/31 19:41:37 vapier Exp $
 
-S=${WORKDIR}/${PN}
-IUSE=""
 DESCRIPTION="Converts between the rpm, dpkg, stampede slp, and slackware tgz file formats"
-SRC_URI="http://kitenet.net/programs/alien/${PN}_${PV}.tar.gz"
 HOMEPAGE="http://kitenet.net/programs/alien/"
-LICENSE="LGPL-2.1"
-KEYWORDS="~x86 ~ppc"
+SRC_URI="http://kitenet.net/programs/alien/${PN}_${PV}.tar.gz"
 
+LICENSE="LGPL-2.1"
 SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
 
 DEPEND=">=dev-lang/perl-5.6.0
 	>=app-arch/rpm-4.0.4-r4
 	>=app-arch/bzip2-1.0.2-r2
 	>=app-arch/dpkg-1.10.9"
 
-RDEPEND="${DEPEND}"
+S=${WORKDIR}/${PN}
 
 src_compile() {
 	perl Makefile.PL PREFIX="${D}/usr" || die "configuration failed"
@@ -30,9 +29,5 @@ src_install() {
 	    INSTALLMAN1DIR=${D}/usr/share/man/man1 \
 	    INSTALLMAN3DIR=${D}/usr/share/man/man3 \
 	    VARPREFIX=${D}
-	dodoc COPYING INSTALL README TODO
+	dodoc INSTALL README TODO
 }
-
-
-
-
diff --git a/app-arch/atool/atool-0.25.0.ebuild b/app-arch/atool/atool-0.25.0.ebuild
index d12f1c9bf5a0..e4104079fb3f 100644
--- a/app-arch/atool/atool-0.25.0.ebuild
+++ b/app-arch/atool/atool-0.25.0.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-arch/atool/atool-0.25.0.ebuild,v 1.6 2004/01/30 13:07:28 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/atool/atool-0.25.0.ebuild,v 1.7 2004/05/31 19:41:37 vapier Exp $
 
 DESCRIPTION="script for managaging file archives of various types (atr,tar+gzip,zip,etc)"
-SRC_URI="http://www.student.lu.se/~nbi98oli/src/${P}.tar.gz"
 HOMEPAGE="http://www.student.lu.se/~nbi98oli/"
+SRC_URI="http://www.student.lu.se/~nbi98oli/src/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc sparc"
+IUSE=""
 
 DEPEND="dev-lang/perl"
 
 src_install() {
-	dobin acat adiff als apack atool aunpack
-	dodoc ChangeLog TODO README COPYING
+	dobin acat adiff als apack atool aunpack || die
+	dodoc ChangeLog TODO README
 	doman atool.1
 }
diff --git a/app-arch/atool/atool-0.27.0.ebuild b/app-arch/atool/atool-0.27.0.ebuild
index ae3820ca867f..02d1d6b27620 100644
--- a/app-arch/atool/atool-0.27.0.ebuild
+++ b/app-arch/atool/atool-0.27.0.ebuild
@@ -1,24 +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-arch/atool/atool-0.27.0.ebuild,v 1.3 2004/03/18 15:37:15 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/atool/atool-0.27.0.ebuild,v 1.4 2004/05/31 19:41:37 vapier Exp $
 
 DESCRIPTION="script for managaging file archives of various types (atr,tar+gzip,zip,etc)"
-SRC_URI="http://www.student.lu.se/~nbi98oli/src/${P}.tar.gz"
 HOMEPAGE="http://www.student.lu.se/~nbi98oli/"
+SRC_URI="http://www.student.lu.se/~nbi98oli/src/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc"
+IUSE=""
 
 DEPEND="dev-lang/perl"
 
 src_install() {
-	dobin atool
+	dobin atool || die
 	dosym atool /usr/bin/acat
 	dosym atool /usr/bin/adiff
 	dosym atool /usr/bin/als
 	dosym atool /usr/bin/apack
 	dosym atool /usr/bin/aunpack
-	dodoc ChangeLog TODO README COPYING NEWS
+	dodoc ChangeLog TODO README NEWS
 	doman atool.1
 }
diff --git a/app-arch/cabextract/cabextract-0.5.ebuild b/app-arch/cabextract/cabextract-0.5.ebuild
index e2549e13e3fe..3995654c12eb 100644
--- a/app-arch/cabextract/cabextract-0.5.ebuild
+++ b/app-arch/cabextract/cabextract-0.5.ebuild
@@ -1,24 +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-arch/cabextract/cabextract-0.5.ebuild,v 1.18 2004/04/26 15:27:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/cabextract/cabextract-0.5.ebuild,v 1.19 2004/05/31 19:41:37 vapier Exp $
 
 DESCRIPTION="Extracts files from Microsoft .cab files"
-SRC_URI="http://www.kyz.uklinux.net/downloads/${P}.tar.gz"
 HOMEPAGE="http://www.kyz.uklinux.net/cabextract.php3"
+SRC_URI="http://www.kyz.uklinux.net/downloads/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc sparc alpha"
+IUSE=""
 
 DEPEND="virtual/glibc"
 
-src_compile() {
-	econf || die "econf failed"
-	emake || die
-}
-
 src_install() {
-	dobin cabextract
+	dobin cabextract || die
 	doman cabextract.1
-	dodoc COPYING NEWS README TODO AUTHORS
+	dodoc NEWS README TODO AUTHORS
 }
diff --git a/app-arch/cpio/cpio-2.4.2-r4.ebuild b/app-arch/cpio/cpio-2.4.2-r4.ebuild
index bb2e5343a57c..c67802c1ed60 100644
--- a/app-arch/cpio/cpio-2.4.2-r4.ebuild
+++ b/app-arch/cpio/cpio-2.4.2-r4.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-arch/cpio/cpio-2.4.2-r4.ebuild,v 1.2 2004/02/22 06:03:21 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/cpio/cpio-2.4.2-r4.ebuild,v 1.3 2004/05/31 19:41:37 vapier Exp $
 
 DESCRIPTION="A file archival tool which can also read and write tar files"
-SRC_URI="ftp://prep.ai.mit.edu/gnu/cpio/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/cpio/cpio.html"
-KEYWORDS="x86 amd64 ppc sparc alpha hppa mips ia64"
-SLOT="0"
+SRC_URI="ftp://prep.ai.mit.edu/gnu/cpio/${P}.tar.gz"
+
 LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc sparc mips alpha hppa amd64 ia64"
+IUSE=""
 
 DEPEND="virtual/glibc"
 
@@ -19,16 +21,16 @@ src_unpack() {
 }
 
 src_compile() {
-	./configure --host=${CHOST} \
+	./configure \
+		--host=${CHOST} \
 		--prefix=/usr || die
 	emake || die
 }
 
 src_install() {
 	#our official mt is now the mt in app-arch/mt-st (supports Linux 2.4, unlike this one)
-	dobin cpio
+	dobin cpio || die
 	doman cpio.1
 	doinfo cpio.info
-	dodoc COPYING* ChangeLog NEWS README
+	dodoc ChangeLog NEWS README
 }
-
diff --git a/app-arch/dpkg/dpkg-1.10.15.ebuild b/app-arch/dpkg/dpkg-1.10.15.ebuild
index f9ad31331bbf..f037a9fbe813 100644
--- a/app-arch/dpkg/dpkg-1.10.15.ebuild
+++ b/app-arch/dpkg/dpkg-1.10.15.ebuild
@@ -1,6 +1,6 @@
-# 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-arch/dpkg/dpkg-1.10.15.ebuild,v 1.2 2003/12/10 18:25:20 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.10.15.ebuild,v 1.3 2004/05/31 19:41:37 vapier Exp $
 
 inherit eutils
 
@@ -11,6 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/dpkg/${P/-/_}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc"
+IUSE=""
 
 RDEPEND=">=dev-lang/perl-5.6.0
 	>=sys-libs/ncurses-5.2-r7
@@ -33,5 +34,5 @@ src_install() {
 	dodir /etc/alternatives
 	insinto /etc/alternatives
 	doins scripts/README.alternatives
-	dodoc ABOUT-NLS COPYING ChangeLog INSTALL THANKS TODO
+	dodoc ChangeLog INSTALL THANKS TODO
 }
diff --git a/app-arch/dpkg/dpkg-1.10.18.1.ebuild b/app-arch/dpkg/dpkg-1.10.18.1.ebuild
index bfd05b0cffdc..b7d472f958f8 100644
--- a/app-arch/dpkg/dpkg-1.10.18.1.ebuild
+++ b/app-arch/dpkg/dpkg-1.10.18.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-arch/dpkg/dpkg-1.10.18.1.ebuild,v 1.4 2004/04/13 12:21:34 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.10.18.1.ebuild,v 1.5 2004/05/31 19:41:37 vapier Exp $
 
 inherit eutils
 
@@ -11,6 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/dpkg/${P/-/_}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~ppc sparc ~amd64"
+IUSE=""
 
 RDEPEND=">=dev-lang/perl-5.6.0
 	>=sys-libs/ncurses-5.2-r7
@@ -34,5 +35,5 @@ src_install() {
 	dodir /etc/alternatives
 	insinto /etc/alternatives
 	doins scripts/README.alternatives
-	dodoc ABOUT-NLS COPYING ChangeLog INSTALL THANKS TODO
+	dodoc ChangeLog INSTALL THANKS TODO
 }
diff --git a/app-arch/dpkg/dpkg-1.10.18.ebuild b/app-arch/dpkg/dpkg-1.10.18.ebuild
index ca3e28e54917..381084bad324 100644
--- a/app-arch/dpkg/dpkg-1.10.18.ebuild
+++ b/app-arch/dpkg/dpkg-1.10.18.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-arch/dpkg/dpkg-1.10.18.ebuild,v 1.3 2004/03/02 13:50:48 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.10.18.ebuild,v 1.4 2004/05/31 19:41:37 vapier Exp $
 
 inherit eutils
 
@@ -11,6 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/dpkg/${P/-/_}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~ppc sparc"
+IUSE=""
 
 RDEPEND=">=dev-lang/perl-5.6.0
 	>=sys-libs/ncurses-5.2-r7
@@ -33,5 +34,5 @@ src_install() {
 	dodir /etc/alternatives
 	insinto /etc/alternatives
 	doins scripts/README.alternatives
-	dodoc ABOUT-NLS COPYING ChangeLog INSTALL THANKS TODO
+	dodoc ChangeLog INSTALL THANKS TODO
 }
diff --git a/app-arch/flexbackup/flexbackup-1.2.0-r1.ebuild b/app-arch/flexbackup/flexbackup-1.2.0-r1.ebuild
index cd145a4c23a4..2a19eb6b13a7 100644
--- a/app-arch/flexbackup/flexbackup-1.2.0-r1.ebuild
+++ b/app-arch/flexbackup/flexbackup-1.2.0-r1.ebuild
@@ -1,15 +1,15 @@
-# 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-arch/flexbackup/flexbackup-1.2.0-r1.ebuild,v 1.7 2003/11/14 11:39:04 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/flexbackup/flexbackup-1.2.0-r1.ebuild,v 1.8 2004/05/31 19:41:37 vapier Exp $
 
-DESCRIPTION="Flexible backup script using perl."
+DESCRIPTION="Flexible backup script using perl"
 HOMEPAGE="http://flexbackup.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
+IUSE=""
 
 RDEPEND="dev-lang/perl
 	sys-apps/findutils
@@ -27,7 +27,7 @@ src_install() {
 	dosed "/^\$type = /s:'afio':'tar':" /etc/flexbackup.conf
 	dosed "/^\$buffer = /s:'buffer':'false':" /etc/flexbackup.conf
 
-	dodoc CHANGES COPYING CREDITS INSTALL README TODO
+	dodoc CHANGES CREDITS INSTALL README TODO
 	dohtml faq.html
 }
 
diff --git a/app-arch/flexbackup/flexbackup-1.2.1.ebuild b/app-arch/flexbackup/flexbackup-1.2.1.ebuild
index 5c9c3bdec70d..21d49ebf9b5f 100644
--- a/app-arch/flexbackup/flexbackup-1.2.1.ebuild
+++ b/app-arch/flexbackup/flexbackup-1.2.1.ebuild
@@ -1,15 +1,15 @@
-# 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-arch/flexbackup/flexbackup-1.2.1.ebuild,v 1.3 2003/11/14 11:39:04 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/flexbackup/flexbackup-1.2.1.ebuild,v 1.4 2004/05/31 19:41:37 vapier Exp $
 
-DESCRIPTION="Flexible backup script using perl."
+DESCRIPTION="Flexible backup script using perl"
 HOMEPAGE="http://flexbackup.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
+IUSE=""
 
 RDEPEND="dev-lang/perl
 	sys-apps/findutils
@@ -28,7 +28,7 @@ src_install() {
 	dosed "/^\$type = /s:'afio':'tar':" /etc/flexbackup.conf
 	dosed "/^\$buffer = /s:'buffer':'false':" /etc/flexbackup.conf
 
-	dodoc CHANGES COPYING CREDITS INSTALL README TODO
+	dodoc CHANGES CREDITS INSTALL README TODO
 	dohtml faq.html
 }
 
diff --git a/app-arch/gzip/gzip-1.3.3-r2.ebuild b/app-arch/gzip/gzip-1.3.3-r2.ebuild
index 2c366b6d2124..c3968d138b84 100644
--- a/app-arch/gzip/gzip-1.3.3-r2.ebuild
+++ b/app-arch/gzip/gzip-1.3.3-r2.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-arch/gzip/gzip-1.3.3-r2.ebuild,v 1.7 2004/04/27 04:56:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/gzip-1.3.3-r2.ebuild,v 1.8 2004/05/31 19:41:37 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -74,7 +74,7 @@ src_install() {
 		ln -s gzip.1.gz gzcat.1.gz
 		cd ${S}
 		rm -rf ${D}/usr/man ${D}/usr/lib
-		dodoc ChangeLog COPYING NEWS README THANKS TODO
+		dodoc ChangeLog NEWS README THANKS TODO
 		docinto txt
 		dodoc algorithm.doc gzip.doc
 	else
diff --git a/app-arch/lzop/lzop-1.01.ebuild b/app-arch/lzop/lzop-1.01.ebuild
index 6cd08a1ede64..b133bbfe1cf2 100644
--- a/app-arch/lzop/lzop-1.01.ebuild
+++ b/app-arch/lzop/lzop-1.01.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-arch/lzop/lzop-1.01.ebuild,v 1.3 2004/05/21 16:42:59 jhuebel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lzop/lzop-1.01.ebuild,v 1.4 2004/05/31 19:41:37 vapier Exp $
 
 DESCRIPTION="Utility for fast (even reat-time) compression/decompression"
 HOMEPAGE="http://www.oberhumer.com/opensource/lzop/"
@@ -9,6 +9,7 @@ SRC_URI="http://www.oberhumer.com/opensource/lzop/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc sparc amd64"
+IUSE=""
 
 DEPEND="dev-libs/lzo"
 
@@ -19,7 +20,7 @@ src_compile() {
 
 src_install() {
 	einstall || die
-	dodoc AUTHORS ChangeLog COPYING* NEWS README THANKS
+	dodoc AUTHORS ChangeLog NEWS README THANKS
 	dodoc doc/lzop.{txt,ps}
 	dohtml doc/*.html
 }
diff --git a/app-arch/par/par-1.1.ebuild b/app-arch/par/par-1.1.ebuild
index 59c2bffa90b1..c4faa2eae18c 100644
--- a/app-arch/par/par-1.1.ebuild
+++ b/app-arch/par/par-1.1.ebuild
@@ -1,18 +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-arch/par/par-1.1.ebuild,v 1.16 2004/03/12 11:11:07 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/par/par-1.1.ebuild,v 1.17 2004/05/31 19:41:37 vapier Exp $
 
-S=${WORKDIR}/par-cmdline
 DESCRIPTION="Parchive archive fixing tool"
+HOMEPAGE="http://parchive.sourceforge.net/"
 SRC_URI="mirror://sourceforge/parchive/par-v${PV}.tar.gz"
-HOMEPAGE="http://parchive.sourceforge.net"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc sparc amd64"
+IUSE=""
 
 DEPEND="virtual/glibc
-		>=sys-apps/sed-4"
+	>=sys-apps/sed-4"
+
+S=${WORKDIR}/par-cmdline
 
 src_unpack() {
 	unpack par-v${PV}.tar.gz
@@ -26,6 +28,6 @@ src_compile() {
 }
 
 src_install() {
-	dobin par
-	dodoc COPYING AUTHORS NEWS README rs.doc
+	dobin par || die
+	dodoc AUTHORS NEWS README rs.doc
 }
diff --git a/app-arch/par2cmdline/par2cmdline-0.3.ebuild b/app-arch/par2cmdline/par2cmdline-0.3.ebuild
index 621db52defd4..ff511cbd2562 100644
--- a/app-arch/par2cmdline/par2cmdline-0.3.ebuild
+++ b/app-arch/par2cmdline/par2cmdline-0.3.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-arch/par2cmdline/par2cmdline-0.3.ebuild,v 1.3 2004/03/12 11:02:24 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/par2cmdline/par2cmdline-0.3.ebuild,v 1.4 2004/05/31 19:41:37 vapier Exp $
 
 DESCRIPTION="A PAR-2.0 file verification and repair tool"
 HOMEPAGE="http://parchive.sourceforge.net/"
 SRC_URI="mirror://sourceforge/parchive/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 amd64"
-DEPEND=""
 
-src_compile() {
-	econf || die
-	emake || die
-}
+DEPEND=""
 
 src_install() {
 	einstall || die
-	local DOCLIST="AUTHORS INSTALL COPYING ChangeLog NEWS PORTING README ROADMAP"
+	local DOCLIST="AUTHORS INSTALL ChangeLog NEWS PORTING README ROADMAP"
 	chmod -x ${DOCLIST}
 	dodoc ${DOCLIST}
 }
diff --git a/app-arch/par2cmdline/par2cmdline-0.4.ebuild b/app-arch/par2cmdline/par2cmdline-0.4.ebuild
index b2dc9acff7b4..d29820b7413b 100644
--- a/app-arch/par2cmdline/par2cmdline-0.4.ebuild
+++ b/app-arch/par2cmdline/par2cmdline-0.4.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-arch/par2cmdline/par2cmdline-0.4.ebuild,v 1.1 2004/05/17 06:39:32 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/par2cmdline/par2cmdline-0.4.ebuild,v 1.2 2004/05/31 19:41:37 vapier Exp $
 
 DESCRIPTION="A PAR-2.0 file verification and repair tool"
 HOMEPAGE="http://parchive.sourceforge.net/"
 SRC_URI="mirror://sourceforge/parchive/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-DEPEND=""
 
-src_compile() {
-	econf || die
-	emake || die
-}
+DEPEND=""
 
 src_install() {
 	einstall || die
-	local DOCLIST="AUTHORS INSTALL COPYING ChangeLog NEWS PORTING README ROADMAP"
+	local DOCLIST="AUTHORS INSTALL ChangeLog NEWS PORTING README ROADMAP"
 	chmod -x ${DOCLIST}
 	dodoc ${DOCLIST}
 }
diff --git a/app-arch/rpm/rpm-4.0.4-r5.ebuild b/app-arch/rpm/rpm-4.0.4-r5.ebuild
index bf9f8291598c..d90161a105b0 100644
--- a/app-arch/rpm/rpm-4.0.4-r5.ebuild
+++ b/app-arch/rpm/rpm-4.0.4-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-arch/rpm/rpm-4.0.4-r5.ebuild,v 1.11 2004/04/07 22:51:10 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.0.4-r5.ebuild,v 1.12 2004/05/31 19:41:37 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -51,7 +51,7 @@ src_install() {
 
 	keepdir /var/lib/rpm
 
-	dodoc CHANGES COPYING CREDITS GROUPS README* RPM* TODO
+	dodoc CHANGES CREDITS GROUPS README* RPM* TODO
 }
 
 pkg_postinst() {
diff --git a/app-arch/rpm/rpm-4.2.1.ebuild b/app-arch/rpm/rpm-4.2.1.ebuild
index 9fabee03c8ed..a7990229bbcc 100644
--- a/app-arch/rpm/rpm-4.2.1.ebuild
+++ b/app-arch/rpm/rpm-4.2.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-arch/rpm/rpm-4.2.1.ebuild,v 1.14 2004/04/11 11:12:37 cretin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.2.1.ebuild,v 1.15 2004/05/31 19:41:37 vapier Exp $
 
 inherit python flag-o-matic libtool eutils
 
@@ -66,7 +66,7 @@ src_install() {
 	keepdir /usr/src/pc/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
 	keepdir /usr/src/pc/RPMS/{noarch,i{3,4,5,6}86,athlon}
 	keepdir /usr/src/pc
-	dodoc CHANGES COPYING CREDITS GROUPS README* RPM* TODO
+	dodoc CHANGES CREDITS GROUPS README* RPM* TODO
 
 	use nls || rm -rf ${D}/usr/share/man/{ko,ja,fr,pl,ru,sk}
 
diff --git a/app-arch/rpm/rpm-4.2_pre069.ebuild b/app-arch/rpm/rpm-4.2_pre069.ebuild
index ee00be0c744d..feb86660d9e0 100644
--- a/app-arch/rpm/rpm-4.2_pre069.ebuild
+++ b/app-arch/rpm/rpm-4.2_pre069.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-arch/rpm/rpm-4.2_pre069.ebuild,v 1.9 2004/04/07 22:51:10 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.2_pre069.ebuild,v 1.10 2004/05/31 19:41:37 vapier Exp $
 
 inherit flag-o-matic libtool eutils
 
@@ -25,8 +25,6 @@ RDEPEND="=sys-libs/db-3.2*
 	!dev-libs/beecrypt"
 S=${WORKDIR}/rpm-4.2
 
-strip-flags
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}
@@ -34,6 +32,8 @@ src_unpack() {
 }
 
 src_compile() {
+	strip-flags
+
 	elibtoolize
 
 	unset LD_ASSUME_KERNEL
@@ -62,7 +62,7 @@ src_install() {
 	keepdir /usr/src/pc/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
 	keepdir /usr/src/pc/RPMS/{noarch,i{3,4,5,6}86,athlon}
 	keepdir /usr/src/pc
-	dodoc CHANGES COPYING CREDITS GROUPS README* RPM* TODO
+	dodoc CHANGES CREDITS GROUPS README* RPM* TODO
 
 	use nls || rm -rf ${D}/usr/share/man/{ko,ja,fr,pl,ru,sk}
 
diff --git a/app-arch/rzip/rzip-2.0.ebuild b/app-arch/rzip/rzip-2.0.ebuild
index 59f87052e17b..e6e07f21f766 100644
--- a/app-arch/rzip/rzip-2.0.ebuild
+++ b/app-arch/rzip/rzip-2.0.ebuild
@@ -1,25 +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-arch/rzip/rzip-2.0.ebuild,v 1.5 2004/05/30 00:41:30 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rzip/rzip-2.0.ebuild,v 1.6 2004/05/31 19:41:37 vapier Exp $
 
-DESCRIPTION="rzip is a compression program for large files"
-SRC_URI="http://rzip.samba.org/ftp/rzip/${P}.tar.gz"
+DESCRIPTION="compression program for large files"
 HOMEPAGE="http://rzip.samba.org/"
-IUSE=""
-SLOT="0"
+SRC_URI="http://rzip.samba.org/ftp/rzip/${P}.tar.gz"
+
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ~ppc ~sparc ~amd64"
+IUSE=""
 
 DEPEND="virtual/glibc
 	sys-apps/coreutils
 	app-arch/bzip2"
 
-src_compile() {
-	econf || die
-	emake || die
-}
-
 src_install() {
 	einstall || die
-	dodoc COPYING
 }
diff --git a/app-arch/sharutils/sharutils-4.2.1-r6.ebuild b/app-arch/sharutils/sharutils-4.2.1-r6.ebuild
index 2a052a38d4f4..4602f2da5edc 100644
--- a/app-arch/sharutils/sharutils-4.2.1-r6.ebuild
+++ b/app-arch/sharutils/sharutils-4.2.1-r6.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-arch/sharutils/sharutils-4.2.1-r6.ebuild,v 1.5 2004/04/10 07:20:17 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/sharutils/sharutils-4.2.1-r6.ebuild,v 1.6 2004/05/31 19:41:37 vapier Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 amd64 ppc sparc alpha hppa ia64 ppc64"
+KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64 ppc64"
 IUSE="nls"
 
 DEPEND="sys-apps/texinfo
@@ -54,8 +54,6 @@ src_install() {
 	rm -rf ${D}/usr/lib
 
 	cd ${S}
-	dodoc AUTHORS BACKLOG COPYING ChangeLog ChangeLog.OLD \
+	dodoc AUTHORS BACKLOG ChangeLog ChangeLog.OLD \
 		NEWS README README.OLD THANKS TODO
 }
-
-
diff --git a/app-arch/sharutils/sharutils-4.2.1-r7.ebuild b/app-arch/sharutils/sharutils-4.2.1-r7.ebuild
index d245fd0db16e..8048dfb767d3 100644
--- a/app-arch/sharutils/sharutils-4.2.1-r7.ebuild
+++ b/app-arch/sharutils/sharutils-4.2.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-arch/sharutils/sharutils-4.2.1-r7.ebuild,v 1.4 2004/04/10 07:20:17 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/sharutils/sharutils-4.2.1-r7.ebuild,v 1.5 2004/05/31 19:41:37 vapier Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha ~hppa ~ia64 ~ppc64 s390"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~ppc64 s390"
 IUSE="nls"
 
 DEPEND="sys-apps/texinfo
@@ -54,8 +54,6 @@ src_install() {
 	rm -rf ${D}/usr/lib
 
 	cd ${S}
-	dodoc AUTHORS BACKLOG COPYING ChangeLog ChangeLog.OLD \
+	dodoc AUTHORS BACKLOG ChangeLog ChangeLog.OLD \
 		NEWS README README.OLD THANKS TODO
 }
-
-
diff --git a/app-arch/star/star-1.4.3.ebuild b/app-arch/star/star-1.4.3.ebuild
index 8636cae6b3d4..756324be3b00 100644
--- a/app-arch/star/star-1.4.3.ebuild
+++ b/app-arch/star/star-1.4.3.ebuild
@@ -1,22 +1,23 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/star/star-1.4.3.ebuild,v 1.3 2004/03/07 17:29:39 iluxa Exp $
-
-S=${WORKDIR}/${P/_alpha[0-9][0-9]}
+# $Header: /var/cvsroot/gentoo-x86/app-arch/star/star-1.4.3.ebuild,v 1.4 2004/05/31 19:41:37 vapier Exp $
 
 DESCRIPTION="An enhanced (world's fastest) tar, as well as enhanced mt/rmt"
-
+HOMEPAGE="http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/star.html"
 #This URI for alpha versions
 #SRC_URI="ftp://ftp.berlios.de/pub/${PN}/alpha/${PN}-${PV/_alpha/a}.tar.bz2"
 #This URI for non-alpha versions
 SRC_URI="ftp://ftp.berlios.de/pub/${PN}/${P}.tar.bz2"
 
-HOMEPAGE="http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/star.html"
-KEYWORDS="x86 amd64 ppc ~sparc ~mips"
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc ~sparc ~mips amd64"
+IUSE=""
+
 DEPEND="virtual/glibc"
 
+S=${WORKDIR}/${P/_alpha[0-9][0-9]}
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}/DEFAULTS
@@ -36,7 +37,7 @@ src_install() {
 	# install mt as mt.star to not conflict with other packages
 	mv ${D}/usr/bin/mt ${D}/usr/bin/mt.star
 
-	dodoc BUILD COPYING Changelog AN-1.* README README.* PORTING TODO
+	dodoc BUILD Changelog AN-1.* README README.* PORTING TODO
 	rm ${D}/usr/man/man1/match*
 	dodir /usr/share/
 	mv ${D}/usr/man/ ${D}/usr/share
diff --git a/app-arch/star/star-1.5_alpha14.ebuild b/app-arch/star/star-1.5_alpha14.ebuild
index a26db30fbdf2..2611f291c19e 100644
--- a/app-arch/star/star-1.5_alpha14.ebuild
+++ b/app-arch/star/star-1.5_alpha14.ebuild
@@ -1,20 +1,21 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/star/star-1.5_alpha14.ebuild,v 1.5 2004/05/10 04:11:06 iluxa Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/star/star-1.5_alpha14.ebuild,v 1.6 2004/05/31 19:41:37 vapier Exp $
 
 S=${WORKDIR}/${P/_alpha[0-9][0-9]}
 
 DESCRIPTION="An enhanced (world's fastest) tar, as well as enhanced mt/rmt"
-
+HOMEPAGE="http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/star.html"
 #This URI for alpha versions
 SRC_URI="ftp://ftp.berlios.de/pub/${PN}/alpha/${PN}-${PV/_alpha/a}.tar.bz2"
 #This URI for non-alpha versions
 #SRC_URI="ftp://ftp.berlios.de/pub/${PN}/${P}.tar.bz2"
 
-HOMEPAGE="http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/star.html"
-KEYWORDS="x86 amd64 ~ppc sparc hppa alpha ia64 ~mips"
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ~ppc sparc ~mips alpha hppa amd64 ia64"
+IUSE=""
+
 DEPEND="virtual/glibc"
 
 src_unpack() {
@@ -44,7 +45,7 @@ src_install() {
 	# install mt as mt.star to not conflict with other packages
 	mv ${D}/usr/bin/mt ${D}/usr/bin/mt.star
 
-	dodoc BUILD COPYING Changelog AN-1.* README README.* PORTING TODO
+	dodoc BUILD Changelog AN-1.* README README.* PORTING TODO
 	rm ${D}/usr/man/man1/match*
 	dodir /usr/share/
 	mv ${D}/usr/man/ ${D}/usr/share
diff --git a/app-arch/upx/upx-1.24-r1.ebuild b/app-arch/upx/upx-1.24-r1.ebuild
index 6a8b9455d4e1..05d23b67f369 100644
--- a/app-arch/upx/upx-1.24-r1.ebuild
+++ b/app-arch/upx/upx-1.24-r1.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-arch/upx/upx-1.24-r1.ebuild,v 1.4 2004/04/16 13:35:34 randy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/upx/upx-1.24-r1.ebuild,v 1.5 2004/05/31 19:41:37 vapier Exp $
 
 S=${WORKDIR}/${P}-linux
-DESCRIPTION="upx is the Ultimate Packer for eXecutables."
-SRC_URI="http://upx.sourceforge.net/download/${P}-linux.tar.gz"
+DESCRIPTION="Ultimate Packer for eXecutables"
 HOMEPAGE="http://upx.sourceforge.net/"
+SRC_URI="http://upx.sourceforge.net/download/${P}-linux.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 s390"
+IUSE=""
+RESTRICT="nostrip"
 
 DEPEND="!app-arch/upx-ucl"
 
-RESTRICT="nostrip"
-
 src_install() {
 	#the pre-compiled version works on gcc-3.2 systems
 	# source version won't compile.
-
 	into /opt
-	dobin upx
+	dobin upx || die
 	doman upx.1
-	dodoc upx.doc upx.html BUGS COPYING LICENSE NEWS README THANKS
+	dodoc upx.doc upx.html BUGS NEWS README THANKS
 }
diff --git a/app-arch/upx/upx-1.24.ebuild b/app-arch/upx/upx-1.24.ebuild
index c334ce61d759..307acb234200 100644
--- a/app-arch/upx/upx-1.24.ebuild
+++ b/app-arch/upx/upx-1.24.ebuild
@@ -1,23 +1,23 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/upx/upx-1.24.ebuild,v 1.5 2004/03/12 11:11:07 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/upx/upx-1.24.ebuild,v 1.6 2004/05/31 19:41:37 vapier Exp $
 
 S=${WORKDIR}/${P}-linux
-DESCRIPTION="upx is the Ultimate Packer for eXecutables."
-SRC_URI="http://upx.sourceforge.net/download/${P}-linux.tar.gz"
+DESCRIPTION="Ultimate Packer for eXecutables"
 HOMEPAGE="http://upx.sourceforge.net/"
+SRC_URI="http://upx.sourceforge.net/download/${P}-linux.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86"
+IUSE=""
+RESTRICT="nostrip"
 
 DEPEND="!app-arch/upx-ucl"
 
-RESTRICT="nostrip"
-
 src_install() {
 	#the pre-compiled version works on gcc-3.2 systems; source version won't compile.
-	dobin upx
+	dobin upx || die
 	doman upx.1
-	dodoc upx.doc upx.html BUGS COPYING LICENSE NEWS README THANKS
+	dodoc upx.doc upx.html BUGS NEWS README THANKS
 }
diff --git a/app-benchmarks/contest/contest-0.61.ebuild b/app-benchmarks/contest/contest-0.61.ebuild
index 02db8ba974b1..e78094c4ab17 100644
--- a/app-benchmarks/contest/contest-0.61.ebuild
+++ b/app-benchmarks/contest/contest-0.61.ebuild
@@ -1,14 +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-benchmarks/contest/contest-0.61.ebuild,v 1.2 2004/04/12 16:09:30 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/contest/contest-0.61.ebuild,v 1.3 2004/05/31 19:46:33 vapier Exp $
 
 DESCRIPTION="Test system responsiveness for compare different kernels"
 HOMEPAGE="http://members.optusnet.com.au/ckolivas/contest/"
 SRC_URI="http://members.optusnet.com.au/ckolivas/contest/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
+
 RDEPEND=">=app-benchmarks/dbench-2.0"
 
 src_unpack () {
@@ -23,8 +25,7 @@ src_compile() {
 }
 
 src_install() {
-	into /usr
-	dobin contest
+	dobin contest || die
 	doman contest.1
-	dodoc COPYING README
+	dodoc README
 }
diff --git a/app-benchmarks/siege/siege-2.55.ebuild b/app-benchmarks/siege/siege-2.55.ebuild
index f15981527347..af0876021e50 100644
--- a/app-benchmarks/siege/siege-2.55.ebuild
+++ b/app-benchmarks/siege/siege-2.55.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-benchmarks/siege/siege-2.55.ebuild,v 1.11 2004/04/25 21:47:12 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/siege-2.55.ebuild,v 1.12 2004/05/31 19:46:33 vapier Exp $
 
 DESCRIPTION="An http regression testing and benchmarking utility"
-SRC_URI="ftp://ftp.armstrong.com/pub/siege/${P}.tar.gz"
 HOMEPAGE="http://www.joedog.org/siege/"
+SRC_URI="ftp://ftp.armstrong.com/pub/siege/${P}.tar.gz"
 
-SLOT="0"
 KEYWORDS="x86 ppc"
+SLOT="0"
 LICENSE="GPL-2"
 IUSE="ssl"
 
@@ -32,5 +32,5 @@ src_install() {
 	# all non-html docs must be gzip'd
 	gzip ${D}/usr/share/doc/${P}/siegerc-example
 
-	dodoc AUTHORS COPYING INSTALL KNOWNBUGS NEWS MACHINES README
+	dodoc AUTHORS INSTALL KNOWNBUGS NEWS MACHINES README
 }
diff --git a/app-benchmarks/siege/siege-2.58.ebuild b/app-benchmarks/siege/siege-2.58.ebuild
index f346f3160498..a7ca8b856ef8 100644
--- a/app-benchmarks/siege/siege-2.58.ebuild
+++ b/app-benchmarks/siege/siege-2.58.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-benchmarks/siege/siege-2.58.ebuild,v 1.3 2004/04/25 21:47:12 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/siege-2.58.ebuild,v 1.4 2004/05/31 19:46:33 vapier Exp $
 
 DESCRIPTION="An http regression testing and benchmarking utility"
-SRC_URI="ftp://sid.joedog.org/pub/siege/${P}.tar.gz"
 HOMEPAGE="http://www.joedog.org/siege/"
+SRC_URI="ftp://sid.joedog.org/pub/siege/${P}.tar.gz"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~ppc"
-LICENSE="GPL-2"
 IUSE="ssl"
 
 DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )"
@@ -32,5 +32,5 @@ src_install() {
 	# all non-html docs must be gzip'd
 	gzip ${D}/usr/share/doc/${P}/siegerc-example
 
-	dodoc AUTHORS COPYING INSTALL KNOWNBUGS NEWS MACHINES README
+	dodoc AUTHORS INSTALL KNOWNBUGS NEWS MACHINES README
 }
diff --git a/app-benchmarks/siege/siege-2.59.ebuild b/app-benchmarks/siege/siege-2.59.ebuild
index 354137193eb3..cf5ce4fcb7a9 100644
--- a/app-benchmarks/siege/siege-2.59.ebuild
+++ b/app-benchmarks/siege/siege-2.59.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-benchmarks/siege/siege-2.59.ebuild,v 1.2 2004/04/25 21:47:12 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/siege-2.59.ebuild,v 1.3 2004/05/31 19:46:33 vapier Exp $
 
 DESCRIPTION="An http regression testing and benchmarking utility"
-SRC_URI="ftp://sid.joedog.org/pub/siege/${P}.tar.gz"
 HOMEPAGE="http://www.joedog.org/siege/"
+SRC_URI="ftp://sid.joedog.org/pub/siege/${P}.tar.gz"
 
-SLOT="0"
 KEYWORDS="~x86 ~ppc"
+SLOT="0"
 LICENSE="GPL-2"
 IUSE="ssl"
 
@@ -32,5 +32,5 @@ src_install() {
 	# all non-html docs must be gzip'd
 	gzip ${D}/usr/share/doc/${P}/siegerc-example
 
-	dodoc AUTHORS COPYING INSTALL KNOWNBUGS NEWS MACHINES README
+	dodoc AUTHORS INSTALL KNOWNBUGS NEWS MACHINES README
 }
diff --git a/app-benchmarks/xfbsuite/xfbsuite-0.9.7.6.ebuild b/app-benchmarks/xfbsuite/xfbsuite-0.9.7.6.ebuild
index b667d971babb..da01ca38761c 100644
--- a/app-benchmarks/xfbsuite/xfbsuite-0.9.7.6.ebuild
+++ b/app-benchmarks/xfbsuite/xfbsuite-0.9.7.6.ebuild
@@ -1,7 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /home/cvsroot/gentoo-x86/app-benchmarks/xfbsuite-0.9.7.3, 2004/04/12 13:22:09
-
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/xfbsuite/xfbsuite-0.9.7.6.ebuild,v 1.3 2004/05/31 19:46:33 vapier Exp $
 
 DESCRIPTION="benchmark suite"
 HOMEPAGE="https://sourceforge.net/projects/fbsuite/"
@@ -9,10 +8,9 @@ SRC_URI="mirror://sourceforge/fbsuite/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="~x86 ~ppc ~amd64"
 IUSE=""
 
-
 DEPEND="dev-lang/perl
 	dev-perl/perl-tk"
 
@@ -22,8 +20,8 @@ src_install() {
 
 	dodoc doc/Todo doc/Readme.DE
 
-	dobin bin/{xfbsuite.tk,xfbsuite.pl,xfbsuite.sh}
+	dobin bin/{xfbsuite.tk,xfbsuite.pl,xfbsuite.sh} || die
 
 	exeinto /usr/bin/xfbsuite
-	doexe bin/{stream,cachebench,nbench,NNET.DAT,bonnie++,piozone}
+	doexe bin/{stream,cachebench,nbench,NNET.DAT,bonnie++,piozone} || die
 }