change glibc to libc and clean up other horribly ugly ebuilds

23 files changed, 130 insertions, 161 deletions

diff --git a/app-misc/sonypid/sonypid-1.9.ebuild b/app-misc/sonypid/sonypid-1.9.ebuild
index 864686b4a982..07e1904e79ea 100644
--- a/app-misc/sonypid/sonypid-1.9.ebuild
+++ b/app-misc/sonypid/sonypid-1.9.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/sonypid/sonypid-1.9.ebuild,v 1.4 2004/06/24 22:33:52 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/sonypid/sonypid-1.9.ebuild,v 1.5 2004/06/28 04:14:09 vapier Exp $
 
-DESCRIPTION="sonypid - a tool to use the Sony Vaios jog-dial as a mouse-wheel"
+DESCRIPTION="tool to use the Sony Vaios jog-dial as a mouse-wheel"
 HOMEPAGE="http://spop.free.fr/sonypi/"
 SRC_URI="http://spop.free.fr/sonypi/${P}.tar.bz2"
-IUSE=""
-SLOT="0"
+
 LICENSE="GPL-2"
-KEYWORDS="x86 -ppc -sparc"
+SLOT="0"
+KEYWORDS="x86"
+IUSE=""
 
 DEPEND="virtual/x11"
 
@@ -16,7 +17,7 @@ src_compile() {
 	emake CFLAGS="${CFLAGS}" || die
 }
 
-src_install () {
-	dobin sonypid
+src_install() {
+	dobin sonypid || die
 	dodoc AUTHORS CHANGES
 }
diff --git a/app-misc/srm/srm-1.2.7.ebuild b/app-misc/srm/srm-1.2.7.ebuild
index a0a88a66f158..60ce010791a0 100644
--- a/app-misc/srm/srm-1.2.7.ebuild
+++ b/app-misc/srm/srm-1.2.7.ebuild
@@ -1,30 +1,27 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/srm/srm-1.2.7.ebuild,v 1.5 2004/06/24 22:34:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/srm/srm-1.2.7.ebuild,v 1.6 2004/06/28 04:14:35 vapier Exp $
 
 DESCRIPTION="A command-line compatible rm which destroys file contents before unlinking."
-HOMEPAGE="http://sourceforge.net/projects/srm"
+HOMEPAGE="http://sourceforge.net/projects/srm/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-RESTRICT="nomirror"
-KEYWORDS="x86 amd64"
+
 LICENSE="X11"
 SLOT="0"
+KEYWORDS="x86 amd64"
 IUSE=""
 
-DEPEND="virtual/glibc"
-
-RDEPEND="virtual/glibc
+DEPEND="virtual/libc"
+RDEPEND="virtual/libc
 	!app-misc/secure-delete"
 
-src_install () {
+src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
-	dodoc README Changes        || die "dodoc failed"
+	dodoc README Changes
 }
 
 pkg_postinst() {
-	echo
 	ewarn "Please notice that srm will not work as expected with any"
 	ewarn "journaled file system (e.g. reiserfs, ext3)."
 	ewarn "Please read /usr/share/doc/${P}/README.gz"
-	echo
 }
diff --git a/app-misc/srm/srm-1.2.8.ebuild b/app-misc/srm/srm-1.2.8.ebuild
index bfa29a368c12..ad66689a4b50 100644
--- a/app-misc/srm/srm-1.2.8.ebuild
+++ b/app-misc/srm/srm-1.2.8.ebuild
@@ -1,32 +1,29 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/srm/srm-1.2.8.ebuild,v 1.4 2004/06/24 22:34:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/srm/srm-1.2.8.ebuild,v 1.5 2004/06/28 04:14:35 vapier Exp $
 
 DESCRIPTION="A command-line compatible rm which destroys file contents before unlinking."
-HOMEPAGE="http://sourceforge.net/projects/srm"
+HOMEPAGE="http://sourceforge.net/projects/srm/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-RESTRICT="nomirror"
-KEYWORDS="~x86 ~amd64 ~ppc"
+
 LICENSE="X11"
 SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
 IUSE=""
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	sys-apps/gawk
 	sys-apps/grep"
-
-RDEPEND="virtual/glibc
+RDEPEND="virtual/libc
 	!app-misc/secure-delete"
 
-src_install () {
+src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
-	dodoc README Changes        || die "dodoc failed"
+	dodoc README Changes
 }
 
 pkg_postinst() {
-	echo
 	ewarn "Please notice that srm will not work as expected with any"
 	ewarn "journaled file system (e.g. reiserfs, ext3)."
-	ewarn "Please read /usr/share/doc/${P}/README.gz"
-	echo
+	ewarn "Please read /usr/share/doc/${PF}/README.gz"
 }
diff --git a/app-misc/symlinks/symlinks-1.2.ebuild b/app-misc/symlinks/symlinks-1.2.ebuild
index 7b2a99dc0c2a..352a8c918847 100644
--- a/app-misc/symlinks/symlinks-1.2.ebuild
+++ b/app-misc/symlinks/symlinks-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/symlinks/symlinks-1.2.ebuild,v 1.8 2004/06/24 22:34:48 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/symlinks/symlinks-1.2.ebuild,v 1.9 2004/06/28 04:14:51 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="x86 alpha"
 IUSE="static"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
@@ -33,7 +33,7 @@ src_compile() {
 }
 
 src_install() {
-	dobin symlinks
+	dobin symlinks || die
 	doman symlinks.8
 	dodoc symlinks.lsm
 }
diff --git a/app-misc/tdl/tdl-1.4.1.ebuild b/app-misc/tdl/tdl-1.4.1.ebuild
index 1273fddc478c..b687ecbbb706 100644
--- a/app-misc/tdl/tdl-1.4.1.ebuild
+++ b/app-misc/tdl/tdl-1.4.1.ebuild
@@ -1,26 +1,27 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tdl/tdl-1.4.1.ebuild,v 1.8 2004/06/24 22:35:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tdl/tdl-1.4.1.ebuild,v 1.9 2004/06/28 04:15:18 vapier Exp $
 
 DESCRIPTION="Command line To Do List manager"
 HOMEPAGE="http://www.rc0.org.uk/tdl/"
 SRC_URI="http://www.rrbcurnow.freeuk.com/tdl/${P}.tar.gz"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 alpha ~ppc"
 IUSE="readline ncurses doc"
 
-RDEPEND="readline? ( >=sys-libs/readline-4.3
-			ncurses? ( sys-libs/ncurses )
-			!ncurses? ( sys-libs/libtermcap-compat ) )"
+RDEPEND="
+	readline? (
+		>=sys-libs/readline-4.3
+		ncurses? ( sys-libs/ncurses )
+		!ncurses? ( sys-libs/libtermcap-compat )
+	)"
 DEPEND="${RDEPEND}
 	sys-apps/texinfo
 	>=sys-apps/sed-4
 	doc? ( virtual/tetex )"
 
-S=${WORKDIR}/${P}
-
 src_compile() {
 	local myconf="--prefix=/usr"
 
@@ -42,7 +43,7 @@ src_compile() {
 src_install() {
 	local i
 
-	dodoc COPYING README NEWS tdl.txt ${FILESDIR}/screenshot.png
+	dodoc README NEWS tdl.txt ${FILESDIR}/screenshot.png
 	doinfo tdl.info
 	dohtml tdl.html
 
diff --git a/app-misc/tdl/tdl-1.5.2.ebuild b/app-misc/tdl/tdl-1.5.2.ebuild
index 8cd0cd3aaf29..7fa6ea61b2f1 100644
--- a/app-misc/tdl/tdl-1.5.2.ebuild
+++ b/app-misc/tdl/tdl-1.5.2.ebuild
@@ -1,21 +1,21 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tdl/tdl-1.5.2.ebuild,v 1.5 2004/06/24 22:35:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tdl/tdl-1.5.2.ebuild,v 1.6 2004/06/28 04:15:18 vapier Exp $
 
 inherit eutils flag-o-matic
 
 DESCRIPTION="Command line To Do List manager"
 HOMEPAGE="http://www.rc0.org.uk/tdl/"
 SRC_URI="http://www.rpcurnow.force9.co.uk/tdl/${P}.tar.gz"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~alpha ~ppc"
 IUSE="readline ncurses doc"
 
 RDEPEND=">=sys-libs/readline-4.3
-		ncurses? ( sys-libs/ncurses )
-		!ncurses? ( sys-libs/libtermcap-compat )"
+	ncurses? ( sys-libs/ncurses )
+	!ncurses? ( sys-libs/libtermcap-compat )"
 DEPEND="${RDEPEND}
 	sys-apps/texinfo
 	>=sys-apps/sed-4
@@ -48,7 +48,7 @@ src_compile() {
 src_install() {
 	local i
 
-	dodoc COPYING README NEWS tdl.txt ${FILESDIR}/screenshot.png
+	dodoc README NEWS tdl.txt ${FILESDIR}/screenshot.png
 	doinfo tdl.info
 	dohtml tdl.html
 
diff --git a/app-misc/tkpasman/tkpasman-2.2.ebuild b/app-misc/tkpasman/tkpasman-2.2.ebuild
index 9e4ee5266840..07a0842cd02a 100644
--- a/app-misc/tkpasman/tkpasman-2.2.ebuild
+++ b/app-misc/tkpasman/tkpasman-2.2.ebuild
@@ -1,24 +1,26 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tkpasman/tkpasman-2.2.ebuild,v 1.6 2004/06/24 22:35:58 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tkpasman/tkpasman-2.2.ebuild,v 1.7 2004/06/28 04:15:45 vapier Exp $
 
 MY_P="TkPasMan-${PV}"
 
+DESCRIPTION="A useful and reliable personal password manager, written in Tcl/Tk"
+HOMEPAGE="http://www.xs4all.nl/~wbsoft/linux/projects/"
 SRC_URI="http://www.xs4all.nl/~wbsoft/linux/projects/${MY_P}.tar.gz"
+
 LICENSE="GPL-2"
-KEYWORDS="x86"
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="A useful and reliable personal password manager, written in Tcl/Tk"
 SLOT="0"
+KEYWORDS="x86"
 IUSE="ssl"
 
 DEPEND=">=dev-lang/tcl-8.3"
-
 RDEPEND="ssl? ( dev-libs/openssl )
 	virtual/x11
 	>=dev-lang/tk-8.3
 	>=dev-lang/tcl-8.3"
 
+S=${WORKDIR}/${MY_P}
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
@@ -32,7 +34,6 @@ src_compile() {
 }
 
 src_install() {
-	dobin tkpasman
-	dodoc README ChangeLog TODO WARNING INSTALL COPYING
+	dobin tkpasman || die
+	dodoc README ChangeLog TODO WARNING INSTALL
 }
-
diff --git a/app-misc/tkpasman/tkpasman-2.2a.ebuild b/app-misc/tkpasman/tkpasman-2.2a.ebuild
index f1839efcf29b..dfd4e780cecf 100644
--- a/app-misc/tkpasman/tkpasman-2.2a.ebuild
+++ b/app-misc/tkpasman/tkpasman-2.2a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tkpasman/tkpasman-2.2a.ebuild,v 1.6 2004/06/24 22:35:58 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tkpasman/tkpasman-2.2a.ebuild,v 1.7 2004/06/28 04:15:45 vapier Exp $
 
 MY_P="TkPasMan-${PV}"
 S=${WORKDIR}/${MY_P}
@@ -33,7 +33,6 @@ src_compile() {
 }
 
 src_install() {
-	dobin tkpasman
-	dodoc README ChangeLog TODO WARNING INSTALL COPYING
+	dobin tkpasman || die
+	dodoc README ChangeLog TODO WARNING INSTALL
 }
-
diff --git a/app-misc/tpconfig/tpconfig-3.1.3.ebuild b/app-misc/tpconfig/tpconfig-3.1.3.ebuild
index 570f6b9e53b2..b0d3f1e80ee8 100644
--- a/app-misc/tpconfig/tpconfig-3.1.3.ebuild
+++ b/app-misc/tpconfig/tpconfig-3.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tpconfig/tpconfig-3.1.3.ebuild,v 1.9 2004/06/24 22:36:31 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tpconfig/tpconfig-3.1.3.ebuild,v 1.10 2004/06/28 04:16:10 vapier Exp $
 
 DESCRIPTION="Touchpad config for ALPS and Synaptics TPs. Controls tap/click behaviour"
 HOMEPAGE="http://www.compass.com/synaptics/"
@@ -11,14 +11,9 @@ SLOT="0"
 KEYWORDS="x86"
 IUSE=""
 
-src_compile() {
-	econf || die "econf failed"
-	emake || die "Failed emake"
-}
-
 src_install() {
-	dobin tpconfig
-	dodoc README AUTHORS NEWS INSTALL COPYING
+	dobin tpconfig || die
+	dodoc README AUTHORS NEWS INSTALL
 	exeinto /etc/init.d ; doexe ${FILESDIR}/tpconfig
 	insinto /etc/conf.d ; newins ${FILESDIR}/tpconfig.conf tpconfig
 }
diff --git a/app-misc/ttyrec/ttyrec-1.0.6.ebuild b/app-misc/ttyrec/ttyrec-1.0.6.ebuild
index fabfdf72a590..6e789ed68929 100644
--- a/app-misc/ttyrec/ttyrec-1.0.6.ebuild
+++ b/app-misc/ttyrec/ttyrec-1.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ttyrec/ttyrec-1.0.6.ebuild,v 1.4 2004/06/24 22:36:42 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ttyrec/ttyrec-1.0.6.ebuild,v 1.5 2004/06/28 04:16:26 vapier Exp $
 
 DESCRIPTION="tty recorder"
 HOMEPAGE="http://namazu.org/~satoru/ttyrec/"
@@ -8,17 +8,17 @@ SRC_URI="http://namazu.org/~satoru/ttyrec/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE=""
 KEYWORDS="x86"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
-src_compile () {
+src_compile() {
 	make CFLAGS="${CFLAGS}" || die
 }
 
-src_install () {
-	dobin ttyrec ttyplay ttytime
+src_install() {
+	dobin ttyrec ttyplay ttytime || die
 	dodoc README
 	doman *.1
 }
diff --git a/app-misc/uptimed/uptimed-0.3.0-r1.ebuild b/app-misc/uptimed/uptimed-0.3.0-r1.ebuild
index ad587ac58d04..42da755a20ac 100644
--- a/app-misc/uptimed/uptimed-0.3.0-r1.ebuild
+++ b/app-misc/uptimed/uptimed-0.3.0-r1.ebuild
@@ -1,14 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/uptimed/uptimed-0.3.0-r1.ebuild,v 1.7 2004/06/24 22:37:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/uptimed/uptimed-0.3.0-r1.ebuild,v 1.8 2004/06/28 04:16:55 vapier Exp $
 
 DESCRIPTION="Standard informational utilities and process-handling tools"
-SRC_URI="mirror://sourceforge/uptimed/${P}.tar.bz2"
-RESTRICT="nomirror"
 HOMEPAGE="http://unixcode.org/uptimed/"
+SRC_URI="mirror://sourceforge/uptimed/${P}.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ~ppc"
 IUSE=""
 
@@ -27,7 +26,7 @@ src_install() {
 
 	make DESTDIR=${D} install || die
 
-	dodoc README NEWS TODO AUTHORS COPYING CREDITS
+	dodoc README NEWS TODO AUTHORS CREDITS
 	exeinto /etc/init.d ; newexe ${FILESDIR}/uptimed uptimed
 }
 
diff --git a/app-misc/uptimed/uptimed-0.3.1.ebuild b/app-misc/uptimed/uptimed-0.3.1.ebuild
index 9db5e7084d0b..de4dd20d6048 100644
--- a/app-misc/uptimed/uptimed-0.3.1.ebuild
+++ b/app-misc/uptimed/uptimed-0.3.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/uptimed/uptimed-0.3.1.ebuild,v 1.6 2004/06/24 22:37:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/uptimed/uptimed-0.3.1.ebuild,v 1.7 2004/06/28 04:16:55 vapier Exp $
 
 DESCRIPTION="Standard informational utilities and process-handling tools"
-SRC_URI="http://unixcode.org/downloads/uptimed/${P}.tar.bz2"
 HOMEPAGE="http://unixcode.org/uptimed/"
+SRC_URI="http://unixcode.org/downloads/uptimed/${P}.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ~ppc amd64"
 IUSE=""
 
@@ -27,7 +27,7 @@ src_install() {
 
 	make DESTDIR=${D} install || die
 
-	dodoc README NEWS TODO AUTHORS COPYING CREDITS
+	dodoc README NEWS TODO AUTHORS CREDITS
 	dodoc INSTALL.cgi sample-cgi/*
 	exeinto /etc/init.d ; newexe ${FILESDIR}/uptimed uptimed
 }
diff --git a/app-misc/vlock/vlock-1.3-r1.ebuild b/app-misc/vlock/vlock-1.3-r1.ebuild
index db78dec03e75..d702e40e9c54 100644
--- a/app-misc/vlock/vlock-1.3-r1.ebuild
+++ b/app-misc/vlock/vlock-1.3-r1.ebuild
@@ -1,30 +1,30 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/vlock/vlock-1.3-r1.ebuild,v 1.14 2004/06/24 22:37:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/vlock/vlock-1.3-r1.ebuild,v 1.15 2004/06/28 04:17:21 vapier Exp $
 
 DESCRIPTION="A console screen locker"
-SRC_URI="ftp://ftp.ibiblio.org/pub/Linux/utils/console/vlock-1.3.tar.gz"
 HOMEPAGE="ftp://ftp.ibiblio.org/pub/Linux/utils/console/"
+SRC_URI="ftp://ftp.ibiblio.org/pub/Linux/utils/console/vlock-1.3.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc alpha ia64 amd64"
+SLOT="0"
+KEYWORDS="x86 ppc alpha amd64 ia64"
 IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_compile() {
 	emake RPM_OPT_FLAGS="${CFLAGS}" || die "emake failed"
 }
 
 src_install() {
-	dobin vlock
+	dobin vlock || die
 	# Setuid root is required to unlock a screen with root's password.
 	# This is "safe" because vlock drops privs ASAP; read the README
 	# for more information.
 	fperms 4711 /usr/bin/vlock
 	doman vlock.1
-	dodoc COPYING README
+	dodoc README
 	insinto /etc/pam.d
 	newins ${FILESDIR}/vlock.pamd vlock
 }
diff --git a/app-misc/vlock/vlock-1.3.ebuild b/app-misc/vlock/vlock-1.3.ebuild
index dd3e59890300..42b50cee6e40 100644
--- a/app-misc/vlock/vlock-1.3.ebuild
+++ b/app-misc/vlock/vlock-1.3.ebuild
@@ -1,24 +1,24 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/vlock/vlock-1.3.ebuild,v 1.10 2004/06/24 22:37:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/vlock/vlock-1.3.ebuild,v 1.11 2004/06/28 04:17:21 vapier Exp $
 
 DESCRIPTION="A console screen locker"
-SRC_URI="ftp://ftp.ibiblio.org/pub/Linux/utils/console/vlock-1.3.tar.gz"
 HOMEPAGE="ftp://ftp.ibiblio.org/pub/Linux/utils/console/"
+SRC_URI="ftp://ftp.ibiblio.org/pub/Linux/utils/console/vlock-1.3.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86"
 IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_compile() {
 	make RPM_OPT_FLAGS="${CFLAGS}" || die
 }
 
 src_install() {
-	dobin vlock
+	dobin vlock || die
 	doman vlock.1
-	dodoc COPYING README
+	dodoc README
 }
diff --git a/app-misc/welcome2l/welcome2l-3.04.ebuild b/app-misc/welcome2l/welcome2l-3.04.ebuild
index ef83a934c500..948990f5adf7 100644
--- a/app-misc/welcome2l/welcome2l-3.04.ebuild
+++ b/app-misc/welcome2l/welcome2l-3.04.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/welcome2l/welcome2l-3.04.ebuild,v 1.7 2004/06/24 22:37:46 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/welcome2l/welcome2l-3.04.ebuild,v 1.8 2004/06/28 04:17:37 vapier Exp $
 
 inherit eutils
 
@@ -13,10 +13,10 @@ SRC_URI="http://www.chez.com/littleigloo/files/${MY_P}.src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc ~amd64 ~sparc"
+KEYWORDS="x86 ppc ~sparc ~amd64"
 IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
@@ -31,7 +31,7 @@ src_compile() {
 src_install() {
 	dobin ${MY_PN}
 	doman ${MY_PN}.1
-	dodoc AUTHORS README INSTALL COPYING ChangeLog BUGS TODO
+	dodoc AUTHORS README INSTALL ChangeLog BUGS TODO
 	exeinto /etc/init.d ; newexe ${FILESDIR}/${PN}.initscript ${MY_PN}
 }
 
diff --git a/app-misc/wipe/wipe-2.1.0.ebuild b/app-misc/wipe/wipe-2.1.0.ebuild
index 0055a53c1b56..a3e8261f78f9 100644
--- a/app-misc/wipe/wipe-2.1.0.ebuild
+++ b/app-misc/wipe/wipe-2.1.0.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/wipe/wipe-2.1.0.ebuild,v 1.9 2004/06/24 22:37:57 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/wipe/wipe-2.1.0.ebuild,v 1.10 2004/06/28 04:17:54 vapier Exp $
 
 DESCRIPTION="Secure file wiping utility based on Peter Gutman's patterns"
-SRC_URI="mirror://sourceforge/wipe/${P}.tar.bz2"
 HOMEPAGE="http://wipe.sourceforge.net/"
+SRC_URI="mirror://sourceforge/wipe/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
 KEYWORDS="x86"
+IUSE=""
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=sys-apps/sed-4"
 
 src_unpack() {
@@ -19,13 +19,8 @@ src_unpack() {
 	sed -i -e '28 i\#include <errno.h>' ${S}/rand.c || die "sed rand.c failed"
 }
 
-src_compile() {
-	econf || die "econf failed"
-	emake || die "compile problem"
-}
-
 src_install() {
-	dobin wipe
+	dobin wipe || die
 	doman wipe.1
 	dodoc copyright CHANGES README TODO TESTING
 }
diff --git a/app-misc/wipe/wipe-2.2.0.ebuild b/app-misc/wipe/wipe-2.2.0.ebuild
index 043ee31a2d9b..f8821ae33048 100644
--- a/app-misc/wipe/wipe-2.2.0.ebuild
+++ b/app-misc/wipe/wipe-2.2.0.ebuild
@@ -1,22 +1,22 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/wipe/wipe-2.2.0.ebuild,v 1.4 2004/06/26 10:47:38 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/wipe/wipe-2.2.0.ebuild,v 1.5 2004/06/28 04:17:54 vapier Exp $
 
 DESCRIPTION="Secure file wiping utility based on Peter Gutman's patterns"
 HOMEPAGE="http://wipe.sourceforge.net/"
 SRC_URI="mirror://sourceforge/wipe/${P}.tar.bz2"
-RESTRICT="nomirror"
-KEYWORDS="x86 ~ppc"
+
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="x86 ~ppc"
 IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_install() {
 	dobin wipe || die "dobin failed"
-	doman wipe.1 || die "doman failed"
-	dodoc copyright CHANGES README TODO TESTING || die "dodoc failed"
+	doman wipe.1
+	dodoc CHANGES README TODO TESTING
 }
 
 pkg_postinst() {
diff --git a/app-misc/worker/worker-2.8.3.ebuild b/app-misc/worker/worker-2.8.3.ebuild
index dfcaf59ab335..9beb0943adaa 100644
--- a/app-misc/worker/worker-2.8.3.ebuild
+++ b/app-misc/worker/worker-2.8.3.ebuild
@@ -1,25 +1,20 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/worker/worker-2.8.3.ebuild,v 1.5 2004/06/24 22:38:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/worker/worker-2.8.3.ebuild,v 1.6 2004/06/28 04:18:14 vapier Exp $
 
-DESCRIPTION="Worker Filemanager: Amiga Directory Opus 4 clone."
-SRC_URI="http://www.boomerangsworld.de/worker/downloads/${P}.tar.bz2"
+DESCRIPTION="Worker Filemanager: Amiga Directory Opus 4 clone"
 HOMEPAGE="http://www.boomerangsworld.de/worker/"
+SRC_URI="http://www.boomerangsworld.de/worker/downloads/${P}.tar.bz2"
 
-IUSE=""
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ~ppc ~amd64 ~ia64 ~sparc ~alpha ~hppa ~mips"
+IUSE=""
 
 DEPEND="virtual/x11"
 
-src_compile() {
-	econf || die "configure problem"
-	emake || die "compile problem"
-}
-
 src_install() {
 	make DESTDIR=${D} install || die "install problem"
 	doman man/worker.1
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README README_LARGEFILES THANKS
+	dodoc AUTHORS ChangeLog INSTALL NEWS README README_LARGEFILES THANKS
 }
diff --git a/app-misc/worker/worker-2.8.4.ebuild b/app-misc/worker/worker-2.8.4.ebuild
index 036db09daf27..efda43695fd4 100644
--- a/app-misc/worker/worker-2.8.4.ebuild
+++ b/app-misc/worker/worker-2.8.4.ebuild
@@ -1,25 +1,20 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/worker/worker-2.8.4.ebuild,v 1.3 2004/06/24 22:38:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/worker/worker-2.8.4.ebuild,v 1.4 2004/06/28 04:18:14 vapier Exp $
 
-DESCRIPTION="Worker Filemanager: Amiga Directory Opus 4 clone."
-SRC_URI="http://www.boomerangsworld.de/worker/downloads/${P}.tar.bz2"
+DESCRIPTION="Worker Filemanager: Amiga Directory Opus 4 clone"
 HOMEPAGE="http://www.boomerangsworld.de/worker/"
+SRC_URI="http://www.boomerangsworld.de/worker/downloads/${P}.tar.bz2"
 
-IUSE=""
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64 ~ia64 ~sparc alpha ~hppa ~mips"
+IUSE=""
 
 DEPEND="virtual/x11"
 
-src_compile() {
-	econf || die "configure problem"
-	emake || die "compile problem"
-}
-
 src_install() {
 	make DESTDIR=${D} install || die "install problem"
 	doman man/worker.1
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README README_LARGEFILES THANKS
+	dodoc AUTHORS ChangeLog INSTALL NEWS README README_LARGEFILES THANKS
 }
diff --git a/app-misc/workrave/workrave-1.4.0-r1.ebuild b/app-misc/workrave/workrave-1.4.0-r1.ebuild
index 7e3d28b7ab64..f508d0c965a6 100644
--- a/app-misc/workrave/workrave-1.4.0-r1.ebuild
+++ b/app-misc/workrave/workrave-1.4.0-r1.ebuild
@@ -1,24 +1,23 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.4.0-r1.ebuild,v 1.11 2004/06/24 22:38:18 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.4.0-r1.ebuild,v 1.12 2004/06/28 04:18:34 vapier Exp $
 
-inherit eutils
+# This is the first workrave ebuild with gnome support,
+# which should be considered experimental. The next
+# step should be converting to the gnome2 eclass.
+# <obz@gentoo.org>
 
-# Internal USE flags: noexercises noexperimental distribution
-IUSE="debug gnome nls xml2 noexercises noexperimental distribution"
+inherit eutils
 
 DESCRIPTION="Helpful utility to attack Repetitive Strain Injury (RSI)"
 HOMEPAGE="http://workrave.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-# This is the first workrave ebuild with gnome support,
-# which should be considered experimental. The next
-# step should be converting to the gnome2 eclass.
-# <obz@gentoo.org>
-
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~ppc"
+# Internal USE flags: noexercises noexperimental distribution
+IUSE="debug gnome nls xml2 noexercises noexperimental distribution"
 
 RDEPEND=">=dev-libs/glib-2
 	>=x11-libs/gtk+-2
@@ -33,7 +32,6 @@ RDEPEND=">=dev-libs/glib-2
 	nls? ( sys-devel/gettext )
 	xml2? ( dev-libs/gdome2 )
 	!xml2? ( !gnome? ( >=gnome-base/gconf-2 ) )"
-
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
@@ -82,7 +80,5 @@ src_compile() {
 
 src_install() {
 	einstall || die
-
-	dodoc ABOUT-NLS AUTHORS ChangeLog COPYING NEWS README
+	dodoc AUTHORS ChangeLog NEWS README
 }
-
diff --git a/app-misc/workrave/workrave-1.6.1.ebuild b/app-misc/workrave/workrave-1.6.1.ebuild
index 7893d664ecd4..382f15cd3261 100644
--- a/app-misc/workrave/workrave-1.6.1.ebuild
+++ b/app-misc/workrave/workrave-1.6.1.ebuild
@@ -1,12 +1,9 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.6.1.ebuild,v 1.4 2004/06/24 22:38:18 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.6.1.ebuild,v 1.5 2004/06/28 04:18:34 vapier Exp $
 
 inherit eutils gnome2
 
-# Internal USE flags: noexercises noexperimental distribution
-IUSE="gnome nls xml2 noexercises noexperimental distribution"
-
 DESCRIPTION="Helpful utility to attack Repetitive Strain Injury (RSI)"
 HOMEPAGE="http://workrave.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -14,6 +11,8 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc"
+# Internal USE flags: noexercises noexperimental distribution
+IUSE="gnome nls xml2 noexercises noexperimental distribution"
 
 RDEPEND=">=dev-libs/glib-2
 	>=x11-libs/gtk+-2
@@ -28,12 +27,11 @@ RDEPEND=">=dev-libs/glib-2
 	nls? ( sys-devel/gettext )
 	xml2? ( dev-libs/gdome2 )
 	!xml2? ( !gnome? ( >=gnome-base/gconf-2 ) )"
-
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 MAKEOPTS="${MAKEOPTS} -j1"
-DOCS="ABOUT-NLS AUTHORS ChangeLog COPYING NEWS README"
+DOCS="AUTHORS ChangeLog NEWS README"
 
 G2CONF="${G2CONF} $(use_enable distribution)"
 G2CONF="${G2CONF} $(use_enable nls)"
diff --git a/app-misc/zisofs-tools/zisofs-tools-1.0.3.ebuild b/app-misc/zisofs-tools/zisofs-tools-1.0.3.ebuild
index d14041af941d..b25a4a0ad3d6 100644
--- a/app-misc/zisofs-tools/zisofs-tools-1.0.3.ebuild
+++ b/app-misc/zisofs-tools/zisofs-tools-1.0.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/zisofs-tools/zisofs-tools-1.0.3.ebuild,v 1.14 2004/06/24 22:38:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/zisofs-tools/zisofs-tools-1.0.3.ebuild,v 1.15 2004/06/28 04:18:52 vapier Exp $
 
 DESCRIPTION="User utilities for zisofs"
 HOMEPAGE="http://www.kernel.org/pub/linux/utils/fs/zisofs/"
 SRC_URI="mirror://kernel/linux/utils/fs/zisofs/old/${P}.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ~ppc ~alpha"
 IUSE=""
 
@@ -20,5 +20,5 @@ src_compile() {
 
 src_install() {
 	make INSTALLROOT=${D} install || die
-	dodoc CHANGES COPYING INSTALL README
+	dodoc CHANGES INSTALL README
 }
diff --git a/app-misc/zisofs-tools/zisofs-tools-1.0.4.ebuild b/app-misc/zisofs-tools/zisofs-tools-1.0.4.ebuild
index fe0e7030bb70..e2ee88b2bcd4 100644
--- a/app-misc/zisofs-tools/zisofs-tools-1.0.4.ebuild
+++ b/app-misc/zisofs-tools/zisofs-tools-1.0.4.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/zisofs-tools/zisofs-tools-1.0.4.ebuild,v 1.9 2004/06/24 22:38:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/zisofs-tools/zisofs-tools-1.0.4.ebuild,v 1.10 2004/06/28 04:18:52 vapier Exp $
 
 DESCRIPTION="User utilities for zisofs"
 HOMEPAGE="http://www.kernel.org/pub/linux/utils/fs/zisofs/"
 SRC_URI="mirror://kernel/linux/utils/fs/zisofs/${P}.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ~ppc ~alpha"
 IUSE=""
 
@@ -20,5 +20,5 @@ src_compile() {
 
 src_install() {
 	make INSTALLROOT=${D} install || die
-	dodoc CHANGES COPYING INSTALL README
+	dodoc CHANGES INSTALL README
 }