repoman'd

59 files changed, 373 insertions, 713 deletions

diff --git a/app-misc/kleds/kleds-0.7.1.ebuild b/app-misc/kleds/kleds-0.7.1.ebuild
index 53559c0993f4..7230653018ae 100644
--- a/app-misc/kleds/kleds-0.7.1.ebuild
+++ b/app-misc/kleds/kleds-0.7.1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-misc/kleds/kleds-0.7.1.ebuild,v 1.2 2002/07/25 17:20:02 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/kleds/kleds-0.7.1.ebuild,v 1.3 2002/07/25 19:18:34 seemant Exp $
 inherit kde-base || die
 
-S="${WORKDIR}/kleds-${PV}"
 need-kde 3.0 
 
+S=${WORKDIR}/kleds-${PV}
 DESCRIPTION="A KDE applet that displays the keyboard lock states."
 SRC_URI="http://www.hansmatzen.de/software/kleds/${P}.tar.gz"
 HOMEPAGE="http://www.hansmatzen.de/english/kleds.html"
diff --git a/app-misc/lcd4linux/lcd4linux-0.98-r1.ebuild b/app-misc/lcd4linux/lcd4linux-0.98-r1.ebuild
index 9ac42edb01a9..d98f895c46b7 100644
--- a/app-misc/lcd4linux/lcd4linux-0.98-r1.ebuild
+++ b/app-misc/lcd4linux/lcd4linux-0.98-r1.ebuild
@@ -1,15 +1,19 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd4linux/lcd4linux-0.98-r1.ebuild,v 1.2 2002/07/11 06:30:16 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd4linux/lcd4linux-0.98-r1.ebuild,v 1.3 2002/07/25 19:18:34 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="system and ISDN information is shown on an external display or in a X11 window."
 SRC_URI="http://download.sourceforge.net/lcd4linux/${P}.tar.gz"
 HOMEPAGE="http://lcd4linux.sourceforge.net"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
 DEPEND="png? ( media-libs/libpng
-		sys-libs/zlib
-		media-libs/libgd )"
+	sys-libs/zlib
+	media-libs/libgd )"
 
 src_compile() {
 
@@ -47,5 +51,4 @@ src_install () {
 		doins lcd4linux.xpm 
 		touch /etc/lcd4linux/lcd4X11.conf 
 	)
-
 }
diff --git a/app-misc/lcd4linux/lcd4linux-0.98-r2.ebuild b/app-misc/lcd4linux/lcd4linux-0.98-r2.ebuild
index 9dfb6bfbd786..cebe02785c93 100644
--- a/app-misc/lcd4linux/lcd4linux-0.98-r2.ebuild
+++ b/app-misc/lcd4linux/lcd4linux-0.98-r2.ebuild
@@ -7,6 +7,10 @@ DESCRIPTION="system and ISDN information is shown on an external display or in a
 SRC_URI="http://download.sourceforge.net/lcd4linux/${P}.tar.gz"
 HOMEPAGE="http://lcd4linux.sourceforge.net"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
 DEPEND="png? ( media-libs/libpng
 		sys-libs/zlib
 		media-libs/libgd )"
diff --git a/app-misc/lcdproc/lcdproc-0.4.1-r1.ebuild b/app-misc/lcdproc/lcdproc-0.4.1-r1.ebuild
index b8cdcb4a17b9..dd4cde92f618 100644
--- a/app-misc/lcdproc/lcdproc-0.4.1-r1.ebuild
+++ b/app-misc/lcdproc/lcdproc-0.4.1-r1.ebuild
@@ -1,21 +1,20 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# /home/cvsroot/gentoo-x86/skel.build,v 1.7 2001/08/25 21:15:08 chadh Exp
-# 20 Sept.2001 / 16.30 CET
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/lcdproc-0.4.1-r1.ebuild,v 1.7 2002/07/25 19:18:34 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="lcdproc - displays system status on Matrix-Orbital 20x4 LCD on a serial port."
 SRC_URI="http://lcdproc.omnipotent.net/${P}.tar.gz"
 HOMEPAGE="http://lcdproc.omnipotent.net/"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
 DEPEND=">=sys-apps/baselayout-1.6.4"
 
 src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die
+	econf || die
 	make || die
 }
 
@@ -26,9 +25,9 @@ src_install () {
 	doman docs/lcdproc.1
 	dodoc README ChangeLog COPYING INSTALL 
 	docinto docs
-	dodoc docs/README.dg docs/README.dg2 docs/hd44780_howto.txt docs/menustuff.txt docs/netstuff.txt 
+	dodoc docs/README.dg* docs/*.txt
 	docinto clients/example
-	dodoc clients/examples/fortune.pl clients/examples/iosock.pl clients/examples/tail.pl clients/examples/x11amp.pl 
+	dodoc clients/examples/*.pl
 	docinto clients/headlines
 	dodoc clients/headlines/lcdheadlines
 
diff --git a/app-misc/lhinv/lhinv-1.1-r1.ebuild b/app-misc/lhinv/lhinv-1.1-r1.ebuild
index 2daa3d1557d0..5c267aac0af8 100644
--- a/app-misc/lhinv/lhinv-1.1-r1.ebuild
+++ b/app-misc/lhinv/lhinv-1.1-r1.ebuild
@@ -1,13 +1,17 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lhinv/lhinv-1.1-r1.ebuild,v 1.7 2002/07/11 06:30:16 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lhinv/lhinv-1.1-r1.ebuild,v 1.8 2002/07/25 19:18:34 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Linux Hardware Inventory"
 SRC_URI="http://download.sourceforge.net/lhinv/${P}.tar.gz"
 HOMEPAGE="http://lhinv.sourceforge.net"
 
-RDEPEND=">=sys-devel/perl-5"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
+RDEPEND="sys-devel/perl"
 
 src_compile() {													 
 	cd ${S}/cgi
diff --git a/app-misc/lirc/lirc-0.6.5.ebuild b/app-misc/lirc/lirc-0.6.5.ebuild
index 209a30328d4d..e036c6e047d2 100644
--- a/app-misc/lirc/lirc-0.6.5.ebuild
+++ b/app-misc/lirc/lirc-0.6.5.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.6.5.ebuild,v 1.1 2002/07/14 14:34:10 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.6.5.ebuild,v 1.2 2002/07/25 19:18:34 seemant Exp $
 
 
 DESCRIPTION="LIRC is a package that allows you to decode and send infra-red \
 	signals of many (but not all) commonly used remote controls."
-
 HOMEPAGE="http://www.lirc.org"
 
 [ "x${LIRC_OPTS}" = x ] && LIRC_OPTS="--with-driver=any \
@@ -41,21 +40,19 @@ HOMEPAGE="http://www.lirc.org"
 # --without-soft-carrier	# if your serial hw generates carrier
 # --with-transmitter	# if you use a transmitter diode
 
+SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86"
-SLOT="0"
 
-DEPEND="virtual/linux-sources
-	virtual/glibc"
-RDEPEND=${DEPEND}
+DEPEND="virtual/linux-sources"
 
-SRC_URI="http://unc.dl.sourceforge.net/sourceforge/lirc/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/lirc/${P}.tar.bz2"
 
 S=${WORKDIR}/${P}
 
 src_unpack() {
 	unpack ${P}.tar.bz2
-	patch -p0 < ${FILESDIR}/${P}-gentoo.diff
+	patch -p0 < ${FILESDIR}/${P}-gentoo.diff || die
 
 	# You need my little patch, because with it:
 	# - lirc compiles with gentoo 2.4.19pre-ac and vanilla kernels
diff --git a/app-misc/lphdisk/lphdisk-0.9.1.ebuild b/app-misc/lphdisk/lphdisk-0.9.1.ebuild
index 5e4cd7db00a9..46f27834eac8 100644
--- a/app-misc/lphdisk/lphdisk-0.9.1.ebuild
+++ b/app-misc/lphdisk/lphdisk-0.9.1.ebuild
@@ -1,18 +1,19 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lphdisk/lphdisk-0.9.1.ebuild,v 1.1 2002/07/19 04:17:29 chadh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lphdisk/lphdisk-0.9.1.ebuild,v 1.2 2002/07/25 19:18:34 seemant Exp $
 
 S=${WORKDIR}/${P}
 
 DESCRIPTION="utility for preparing a hibernation partition for APM Suspend-To-Disk"
 HOMEPAGE="http://www.procyon.com/~pda/lphdisk/"
 SRC_URI="http://www.procyon.com/~pda/lphdisk/${P}.tar.bz2"
-LICENSE="Artistic"
-SLOT="0"
+
 # <chadh@gentoo.org>  I haven't actually tested that this doesn't work
 # on all the below - arches, but it won't work.  This only works on x86
 # laptops with Phoenix NoteBIOS.
+SLOT="0"
 KEYWORDS="x86 -ppc -sparc -mips"
+LICENSE="Artistic"
 
 src_compile() {
 	sed "s:/usr/local:usr:" Makefile > Makefile.orig
diff --git a/app-misc/magicpoint/magicpoint-1.09a-r1.ebuild b/app-misc/magicpoint/magicpoint-1.09a-r1.ebuild
index 8112bf060c98..944e14425b8a 100644
--- a/app-misc/magicpoint/magicpoint-1.09a-r1.ebuild
+++ b/app-misc/magicpoint/magicpoint-1.09a-r1.ebuild
@@ -1,12 +1,16 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-misc/magicpoint/magicpoint-1.09a-r1.ebuild,v 1.2 2002/07/11 06:30:16 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/magicpoint/magicpoint-1.09a-r1.ebuild,v 1.3 2002/07/25 19:18:34 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="an X11 based presentation tool"
 SRC_URI="ftp://ftp.mew.org/pub/MagicPoint/${P}.tar.gz"
 HOMEPAGE="http://www.mew.org/mgp/"
 
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="x86"
+
 DEPEND="virtual/x11
 	gif? ( >=media-libs/libungif-4.0.1 )
 	imlib? ( media-libs/imlib )
diff --git a/app-misc/magicpoint/magicpoint-1.09a.ebuild b/app-misc/magicpoint/magicpoint-1.09a.ebuild
index e0d077ef58d3..b57238024a17 100644
--- a/app-misc/magicpoint/magicpoint-1.09a.ebuild
+++ b/app-misc/magicpoint/magicpoint-1.09a.ebuild
@@ -1,38 +1,40 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-misc/magicpoint/magicpoint-1.09a.ebuild,v 1.2 2002/07/11 06:30:16 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/magicpoint/magicpoint-1.09a.ebuild,v 1.3 2002/07/25 19:18:34 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="an X11 based presentation tool"
 SRC_URI="ftp://ftp.mew.org/pub/MagicPoint/${P}.tar.gz"
 HOMEPAGE="http://www.mew.org/mgp/"
 
-DEPEND="virtual/glibc virtual/x11
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="x86"
+
+DEPEND="virtual/x11
 	ungif? ( >=media-libs/libungif-4.0.1 )
-	gif?   ( >=media-libs/giflib-4.0.1 )"
+	gif?	 ( >=media-libs/giflib-4.0.1 )"
 
 src_compile() {
-   
-   export LIBS="-L/usr/lib/ -L/usr/X11R6/lib/ -lX11"
-   if [ "`use gif`" ] && [ "`use ungif`" ] ; then
-     GIF_FLAG="--enable-gif";
-   else
-     GIF_FLAG="--disable-gif";
-   fi
-
-   ./configure --with-x ${GIF_FLAG} || die
-   xmkmf || die
-   make Makefiles || die
-   make clean || die
-   make ${MAKEOPTS} || die
+	 
+	export LIBS="-L/usr/lib/ -L/usr/X11R6/lib/ -lX11"
+	if [ "`use gif`" ] && [ "`use ungif`" ] ; then
+		GIF_FLAG="--enable-gif";
+	else
+		GIF_FLAG="--disable-gif";
+	fi
+
+	./configure --with-x ${GIF_FLAG} || die
+	xmkmf || die
+	make Makefiles || die
+	make clean || die
+	make ${MAKEOPTS} || die
 }
 
-src_install() {                               
-    make DESTDIR=${D} install || die
-    make DESTDIR=${D} DOCHTMLDIR=/usr/share/doc/${P} \
-             MANPATH=/usr/share/man MANSUFFIX=1 install.man || die
+src_install() {								 
+	make DESTDIR=${D} install || die
+	make DESTDIR=${D} DOCHTMLDIR=/usr/share/doc/${P} \
+		MANPATH=/usr/share/man MANSUFFIX=1 install.man || die
 
-    dodoc COPYRIGHT* FAQ README* RELNOTES SYNTAX TODO* USAGE*
+	dodoc COPYRIGHT* FAQ README* RELNOTES SYNTAX TODO* USAGE*
 }
-
-
diff --git a/app-misc/mouseremote/mouseremote-0.90.ebuild b/app-misc/mouseremote/mouseremote-0.90.ebuild
index 5fcab95fd659..f80673aea433 100644
--- a/app-misc/mouseremote/mouseremote-0.90.ebuild
+++ b/app-misc/mouseremote/mouseremote-0.90.ebuild
@@ -1,17 +1,19 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mouseremote/mouseremote-0.90.ebuild,v 1.2 2002/07/11 06:30:16 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mouseremote/mouseremote-0.90.ebuild,v 1.3 2002/07/25 19:18:34 seemant Exp $
 
+S=${WORKDIR}/MouseRemote
 DESCRIPTION="X10 MouseRemote"
 HOMEPAGE="http://www4.pair.com/gribnif/ha/"
-LICENSE="GPL-2"
-
 SRC_URI="http://www4.pair.com/gribnif/ha/MouseRemote.tar.gz"
 
-DEPEND=""
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
 RDEPEND="dev-perl/Time-HiRes"
+DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/MouseRemote
 
 src_compile() {
 	patch -p1 < ${FILESDIR}/${PN}-gentoo.diff || die
diff --git a/app-misc/multimon/multimon-1.0.ebuild b/app-misc/multimon/multimon-1.0.ebuild
index 16fa01a6dc20..10d7b1354708 100644
--- a/app-misc/multimon/multimon-1.0.ebuild
+++ b/app-misc/multimon/multimon-1.0.ebuild
@@ -1,20 +1,24 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-misc/multimon/multimon-1.0.ebuild,v 1.3 2002/07/11 06:30:16 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/multimon/multimon-1.0.ebuild,v 1.4 2002/07/25 19:18:34 seemant Exp $
 
 S=${WORKDIR}/multimon
 SRC_URI="http://www.baycom.org/~tom/ham/linux/multimon.tar.gz"
 HOMEPAGE="http://www.baycom.org/~tom/ham/linux/multimon.html"
 DESCRIPTION="Multimon decodes digital transmission codes using OSS"
-DEPEND="virtual/glibc virtual/x11"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
+DEPEND="virtual/x11"
 
 src_compile() {
-    try make CFLAGS="${CFLAGS}"
+	make CFLAGS="${CFLAGS}" || die
 }
 
 src_install() {
-    local myarch
-    myarch=`uname -m`
-    dobin bin-${myarch}/gen bin-${myarch}/mkcostab bin-${myarch}/multimon
-
+	local myarch
+	myarch=`uname -m`
+	dobin bin-${myarch}/gen bin-${myarch}/mkcostab bin-${myarch}/multimon
 }
diff --git a/app-misc/mwavem/mwavem-1.0.2.ebuild b/app-misc/mwavem/mwavem-1.0.2.ebuild
index b95f959d0bd2..2e3a08e51c1d 100644
--- a/app-misc/mwavem/mwavem-1.0.2.ebuild
+++ b/app-misc/mwavem/mwavem-1.0.2.ebuild
@@ -1,36 +1,33 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mwavem/mwavem-1.0.2.ebuild,v 1.1 2002/07/24 12:14:18 chadh Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mwavem/mwavem-1.0.2.ebuild,v 1.2 2002/07/25 19:18:34 seemant Exp $
 
+S=${WORKDIR}/${P}
 DESCRIPTION="User level application for IBM Mwave modem"
 HOMEPAGE="http://oss.software.ibm.com/acpmodem/"
 SRC_URI="ftp://www-126.ibm.com/pub/acpmodem/${P}.tar.gz"
-LICENSE="GPL-2"
+
 SLOT="0"
+LICENSE="GPL-2"
 KEYWORDS="x86"
 
 DEPEND=""
-RDEPEND=""
-
-S=${WORKDIR}/${P}
 
 src_compile() {
-		patch -p1 < ${FILESDIR}/${P}-gentoo.diff
+	patch -p1 < ${FILESDIR}/${P}-gentoo.diff
 
-		./configure \
-	    --disable-mwavedd \
-	    --host=${CHOST} || die "./configure failed"
+	./configure \
+    --disable-mwavedd \
+    --host=${CHOST} || die "./configure failed"
 
-		emake || die
+	emake || die
 }
 
 src_install() {
-		make DESTDIR=${D} install ||die
-
-		exeinto /usr/sbin
-		doexe ${FILESDIR}/mwave-dev-handler
+	make DESTDIR=${D} install ||die
 
+	exeinto /usr/sbin
+	doexe ${FILESDIR}/mwave-dev-handler
 }
 
 pkg_postinst() {
diff --git a/app-misc/nomadii-utils/nomadii-utils-0.8.ebuild b/app-misc/nomadii-utils/nomadii-utils-0.8.ebuild
index 0a3a2ff890eb..f9d1017027ff 100644
--- a/app-misc/nomadii-utils/nomadii-utils-0.8.ebuild
+++ b/app-misc/nomadii-utils/nomadii-utils-0.8.ebuild
@@ -1,21 +1,19 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/nomadii-utils/nomadii-utils-0.8.ebuild,v 1.2 2002/07/09 21:43:55 nitro Exp $
-
-P="nomadII-utils-$PV"
-S=${WORKDIR}/${P}
+# $Header: /var/cvsroot/gentoo-x86/app-misc/nomadii-utils/nomadii-utils-0.8.ebuild,v 1.3 2002/07/25 19:18:34 seemant Exp $
 
+MY_P=${P/ii/II}
+S=${WORKDIR}/${MY_P}
 DESCRIPTION="Supports for Creative Nomad II, IIc and II MG under Linux running USB for file transfers and other operations."
 HOMEPAGE="http://nomadii.sourceforge.net/"
-SRC_URI="mirror://sourceforge/nomadii/${P}.tgz"
+SRC_URI="mirror://sourceforge/nomadii/${MY_P}.tgz"
 
-KEYWORDS="x86"
-LICENSE="GPL-2"
 SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
 
-DEPEND="virtual/glibc
-		>=sys-libs/ncurses-5.2
-		readline? ( >=sys-libs/readline-4.1 )"
+DEPEND=">=sys-libs/ncurses-5.2
+	readline? ( >=sys-libs/readline-4.1 )"
 
 src_compile() {
 
@@ -37,11 +35,9 @@ src_compile() {
 }
 
 src_install() {
-
 	dodir /usr/bin /usr/share/man/man1
 	dobin nomadii 
 	newman nomadii.man nomadii.1
-
 }
 
 pkg_postinst() {
diff --git a/app-misc/obexftp/obexftp-0.9.2.ebuild b/app-misc/obexftp/obexftp-0.9.2.ebuild
index 96a5b5a210a2..fa722c059006 100644
--- a/app-misc/obexftp/obexftp-0.9.2.ebuild
+++ b/app-misc/obexftp/obexftp-0.9.2.ebuild
@@ -1,20 +1,18 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-misc/obexftp/obexftp-0.9.2.ebuild,v 1.2 2002/07/20 04:52:46 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/obexftp/obexftp-0.9.2.ebuild,v 1.3 2002/07/25 19:18:34 seemant Exp $
 
 S=${WORKDIR}/${P}
-
 DESCRIPTION="File transfer over OBEX for Siemens mobile phones"
-
 SRC_URI="http://triq.net/obexftp/${P}.tar.gz"
 HOMEPAGE="http://triq.net/obexftp.html"
 
-LICENSE="GPL-2"
 SLOT="0"
+LICENSE="GPL-2"
 KEYWORDS="x86"
 
 DEPEND=">=dev-libs/glib-1.2
-		>=dev-libs/openobex-0.9.8"
+	>=dev-libs/openobex-0.9.8"
 
 src_compile() {
 	econf || die "./configure failed"
diff --git a/app-misc/oneko/oneko-1.2.ebuild b/app-misc/oneko/oneko-1.2.ebuild
index c85fd982ad85..df6fa9364871 100644
--- a/app-misc/oneko/oneko-1.2.ebuild
+++ b/app-misc/oneko/oneko-1.2.ebuild
@@ -1,15 +1,17 @@
 #Copyright 2002 Gentoo Technologies, Inc.
 #Distributed under the terms of the GNU General Public License v2 
-#Author John Stalker <stalker@math.princeton.edu>
-#$Header: /var/cvsroot/gentoo-x86/app-misc/oneko/oneko-1.2.ebuild,v 1.1 2002/02/09 12:15:28 verwilst Exp $
+#$Header: /var/cvsroot/gentoo-x86/app-misc/oneko/oneko-1.2.ebuild,v 1.2 2002/07/25 19:18:34 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A cat (or dog) which chases the mouse around the screen"
 SRC_URI="http://agtoys.sourceforge.net/oneko/${P}.tar.gz"
 HOMEPAGE="http://agtoys.sourceforge.net"
+
 SLOT="0"
-DEPEND="virtual/glibc
-	>=x11-base/xfree-4.1.0"
+LICENSE="BSD"
+KEYWORDS="x86"
+
+DEPEND="x11-base/xfree"
 
 src_compile() {
 
@@ -25,5 +27,3 @@ src_install () {
 	doman oneko.1x
 	dodoc oneko.1x.html oneko.1.html README README-NEW
 }
-
-
diff --git a/app-misc/read-edid/read-edid-1.4.1.ebuild b/app-misc/read-edid/read-edid-1.4.1.ebuild
index aba68d03f0b6..1431a09b7998 100644
--- a/app-misc/read-edid/read-edid-1.4.1.ebuild
+++ b/app-misc/read-edid/read-edid-1.4.1.ebuild
@@ -1,24 +1,25 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/read-edid/read-edid-1.4.1.ebuild,v 1.1 2002/06/18 21:11:40 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/read-edid/read-edid-1.4.1.ebuild,v 1.2 2002/07/25 19:18:34 seemant Exp $
 
+S=${WORKDIR}/${P}
 DESCRIPTION="Read edid is a program that can get information from a pnp monitor."
 HOMEPAGE="http://john.fremlin.de/programs/linux/read-edid/index.html"
-LICENSE=""
-DEPEND=""
-#RDEPEND=""
 SRC_URI="http://john.fremlin.de/programs/linux/read-edid/${P}.tar.gz"
-S=${WORKDIR}/${P}
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
+DEPEND=""
 
 src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
+	econf || die "./configure failed"
 	emake || die
 }
 
 src_install () {
 	make DESTDIR=${D} install || die
+
+	dodoc AUTHORS COPYING ChangeLog LRMI NEWS README
 }
diff --git a/app-misc/rio500/rio500-0.7-r1.ebuild b/app-misc/rio500/rio500-0.7-r1.ebuild
index fce682afb319..c14f60619743 100644
--- a/app-misc/rio500/rio500-0.7-r1.ebuild
+++ b/app-misc/rio500/rio500-0.7-r1.ebuild
@@ -1,20 +1,21 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Michael Conrad Tilstra <michael@gentoo.org> <tadpol@tadpol.org>
-# $Header: /var/cvsroot/gentoo-x86/app-misc/rio500/rio500-0.7-r1.ebuild,v 1.3 2002/04/27 07:31:38 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/rio500/rio500-0.7-r1.ebuild,v 1.4 2002/07/25 19:18:34 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Command line tools for transfering mp3s to and from a Rio500"
 SRC_URI="http://download.sourceforge.net/rio500/${P}.tar.gz"
 HOMEPAGE="http://rio500.sourceforge.net"
 
-DEPEND="virtual/glibc
-	=dev-libs/glib-1.2*"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
+DEPEND="=dev-libs/glib-1.2*"
 
 src_compile() {
-	./configure \
-		--prefix=/usr \
-		--host=${CHOST} \
+	econf \
 		--with-fontpath=/usr/share/rio500/ \
 		--with-id3support || die
 #		--with-usbdevfs
@@ -22,11 +23,8 @@ src_compile() {
 }
 
 src_install () {
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		datadir=${D}/usr/share/rio500 \
-		install || die
+	einstall \
+		datadir=${D}/usr/share/rio500 || die
 
 	dodoc AUTHORS COPYING ChangeLog NEWS README TODO 
 	dodoc fonts/Readme.txt
diff --git a/app-misc/rox/rox-1.2.0.ebuild b/app-misc/rox/rox-1.2.0.ebuild
index a58d3e53f56e..f85b633ef28f 100644
--- a/app-misc/rox/rox-1.2.0.ebuild
+++ b/app-misc/rox/rox-1.2.0.ebuild
@@ -1,17 +1,14 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-misc/rox/rox-1.2.0.ebuild,v 1.5 2002/07/11 03:10:27 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/rox/rox-1.2.0.ebuild,v 1.6 2002/07/25 19:18:34 seemant Exp $
 
+S=${WORKDIR}/${P}
 HOMEPAGE="http://rox.sourceforge.net"
 DESCRIPTION="ROX-Filer is a fast and powerful graphical file manager"
-
-S=${WORKDIR}/${P}
 SRC_URI="mirror://sourceforge/rox/rox-base-1.0.1.tgz
 	mirror://sourceforge/rox/${P}.tgz"
 
-DEPEND="virtual/glibc
-	>=x11-base/xfree-4.0.3
-	=x11-libs/gtk+-1.2*
+DEPEND="=x11-libs/gtk+-1.2*
 	>=media-libs/gdk-pixbuf-0.13
 	dev-libs/libxml2"
 
diff --git a/app-misc/rox/rox-1.2.1.ebuild b/app-misc/rox/rox-1.2.1.ebuild
index cb4e4d32d19e..b4f5a0f03a51 100644
--- a/app-misc/rox/rox-1.2.1.ebuild
+++ b/app-misc/rox/rox-1.2.1.ebuild
@@ -1,19 +1,17 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-misc/rox/rox-1.2.1.ebuild,v 1.1 2002/07/11 03:10:27 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/rox/rox-1.2.1.ebuild,v 1.2 2002/07/25 19:18:34 seemant Exp $
 
-HOMEPAGE="http://rox.sourceforge.net"
+S=${WORKDIR}/${P}
 DESCRIPTION="ROX-Filer is a fast and powerful graphical file manager"
+HOMEPAGE="http://rox.sourceforge.net"
 BPN="rox-base"
 BPV="1.0.2"
 BP=${BPN}-${BPV}
-S=${WORKDIR}/${P}
 SRC_URI="mirror://sourceforge/rox/${BP}.tgz
 	mirror://sourceforge/rox/${P}.tgz"
 
-DEPEND="virtual/glibc
-	>=x11-base/xfree-4.0.3
-	=x11-libs/gtk+-1.2*
+DEPEND="=x11-libs/gtk+-1.2*
 	>=media-libs/gdk-pixbuf-0.13
 	dev-libs/libxml2"
 
diff --git a/app-misc/rox/rox-1.3.2.ebuild b/app-misc/rox/rox-1.3.2.ebuild
index e8e1b0638be3..924894a73200 100644
--- a/app-misc/rox/rox-1.3.2.ebuild
+++ b/app-misc/rox/rox-1.3.2.ebuild
@@ -1,24 +1,21 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/rox/rox-1.3.2.ebuild,v 1.1 2002/07/13 14:23:15 stroke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/rox/rox-1.3.2.ebuild,v 1.2 2002/07/25 19:18:34 seemant Exp $
 
+S=${WORKDIR}/${P}
 DESCRIPTION="ROX-Filer is a fast and powerful graphical file manager"
 HOMEPAGE="http://rox.sourceforge.net"
 SRC_URI="mirror://sourceforge/rox/${P}.tgz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
 
-DEPEND=">=x11-base/xfree-4.0.3
+DEPEND=">=x11-libs/gtk+-2.0.5
 	>=dev-libs/glib-2.0.4
-	>=x11-libs/gtk+-2.0.5
 	>=dev-libs/libxml2-2.4.23
 	>=x11-misc/shared-mime-info-0.7"
 
-RDEPEND="${DEPEND}"
-
-
-S=${WORKDIR}/${P}
 
 src_install() {
 
diff --git a/app-misc/scmxx/scmxx-0.6.0.ebuild b/app-misc/scmxx/scmxx-0.6.0.ebuild
index be4923e97626..bda3464f002b 100644
--- a/app-misc/scmxx/scmxx-0.6.0.ebuild
+++ b/app-misc/scmxx/scmxx-0.6.0.ebuild
@@ -1,21 +1,20 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-misc/scmxx/scmxx-0.6.0.ebuild,v 1.2 2002/07/11 06:30:16 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/scmxx/scmxx-0.6.0.ebuild,v 1.3 2002/07/25 19:18:34 seemant Exp $
 
+S=${WORKDIR}/${P}
 DESCRIPTION="Exchange data with Siemens phones."
 HOMEPAGE="http://www.hendrik-sattler.de/scmxx/"
+SRC_URI="http://ma2geo.mathematik.uni-karlsruhe.de/~hendrik/scmxx/download/${P}.tar.bz2"
+
+SLOT="0"
 LICENSE="GPL-2"
+KEYWORDS="x86"
 
 DEPEND="virtual/glibc"
 
-SRC_URI="http://ma2geo.mathematik.uni-karlsruhe.de/~hendrik/scmxx/download/${P}.tar.bz2"
-S=${WORKDIR}/${P}
-
 src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		|| die "./configure failed"
+	econf || die "./configure failed"
 	emake || die
 }
 
diff --git a/app-misc/screen/screen-3.9.11-r3.ebuild b/app-misc/screen/screen-3.9.11-r3.ebuild
index 56d28069e389..deb7b52fc541 100644
--- a/app-misc/screen/screen-3.9.11-r3.ebuild
+++ b/app-misc/screen/screen-3.9.11-r3.ebuild
@@ -9,29 +9,26 @@ physical terminal between several processes"
 SRC_URI="ftp://ftp.uni-erlangen.de/pub/utilities/screen/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/screen/"
 
-DEPEND="virtual/glibc
-	>=sys-libs/ncurses-5.2"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
+DEPEND=">=sys-libs/ncurses-5.2"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 }
 src_compile() {
-
 	addpredict /dev/ptys/*
 	
-	./configure \
-		--prefix=/usr \
-		--host=${CHOST} \
+	econf \
 		--with-sys-screenrc=/etc/screen/screenrc \
-		--mandir=/usr/share \
 		--libexecdir=/usr/lib/misc || die
 	emake || die
-
 }
 
 src_install () {
-
 	dobin screen
 	insinto /usr/share/terminfo
 	doins terminfo/screencap
@@ -41,5 +38,4 @@ src_install () {
 	doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
 	doman doc/screen.1
 	doinfo doc/screen.info*
-
 }
diff --git a/app-misc/smtm/smtm-1.4.0.ebuild b/app-misc/smtm/smtm-1.4.0.ebuild
index 58f083880f04..6f4f5e267e40 100644
--- a/app-misc/smtm/smtm-1.4.0.ebuild
+++ b/app-misc/smtm/smtm-1.4.0.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-misc/smtm/smtm-1.4.0.ebuild,v 1.1 2002/07/08 20:07:02 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/smtm/smtm-1.4.0.ebuild,v 1.2 2002/07/25 19:18:34 seemant Exp $
 
 DESCRIPTION="Stock ticker, profit/loss calculator and chart tool"
 HOMEPAGE="http://eddelbuettel.com/dirk/code/smtm.html"
 SRC_URI="http://eddelbuettel.com/dirk/code/smtm/smtm_${PV}.tar.gz"
-LICENSE="GPL-2"
+
 SLOT="0"
-KEYWORDS="*"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc"
 
-RDEPEND=">=sys-devel/perl-5
+DEPEND=">=sys-devel/perl-5
 	dev-perl/perl-tk
 	dev-perl/DateManip
 	dev-perl/libwww-perl"
-DEPEND="${RDEPEND}"
 
 S=${WORKDIR}
 
diff --git a/app-misc/sonypid/sonypid-20010123.ebuild b/app-misc/sonypid/sonypid-20010123.ebuild
index 7ee0c17ed618..1026ef635098 100644
--- a/app-misc/sonypid/sonypid-20010123.ebuild
+++ b/app-misc/sonypid/sonypid-20010123.ebuild
@@ -1,16 +1,18 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/sonypid/sonypid-20010123.ebuild,v 1.2 2002/07/11 06:30:16 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/sonypid/sonypid-20010123.ebuild,v 1.3 2002/07/25 19:18:34 seemant Exp $
 
 
+S=${WORKDIR}/${PN}
 DESCRIPTION="sonypid - a tool to use the Sony Vaios jog-dial as a mouse-wheel"
 HOMEPAGE="http://www.alcove-labs.org/en/software/sonypi/"
-LICENSE="GPL"
-DEPEND=""
-RDEPEND=${DEPEND}
 SRC_URI="http://download.alcove-labs.org/software/sonypi/sonypid.tar.bz2"
-S=${WORKDIR}/sonypid
+
 SLOT="0"
+LICENSE="GPL"
+KEYWORDS="x86 -ppc -sparc -sparc64"
+
+DEPEND=""
 
 src_compile() {
 	emake CFLAGS="${CFLAGS} -Wall -Wstrict-prototypes -I/usr/src/linux/include" || die
diff --git a/app-misc/spicctrl/spicctrl-1.2.ebuild b/app-misc/spicctrl/spicctrl-1.2.ebuild
index 4e1149810632..cac7e391fa3e 100644
--- a/app-misc/spicctrl/spicctrl-1.2.ebuild
+++ b/app-misc/spicctrl/spicctrl-1.2.ebuild
@@ -1,18 +1,17 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# Maintainer: Hanno Boeck <hanno@gmx.de>
-# /space/gentoo/cvsroot/gentoo-x86/skel.ebuild,v 1.7 2002/05/18 17:25:12 agenkin Exp
-
+# $Header: /var/cvsroot/gentoo-x86/app-misc/spicctrl/spicctrl-1.2.ebuild,v 1.2 2002/07/25 19:18:34 seemant Exp $
 
+S=${WORKDIR}/${P}
 DESCRIPTION="spicctrl 1.2 - Tool for the sonypi-Device (found in Sony Vaio Notebooks)"
 HOMEPAGE="http://www.alcove-labs.org/en/software/sonypi/"
-LICENSE="GPL"
-DEPEND=""
-RDEPEND="${DEPEND}"
 SRC_URI="http://download.alcove-labs.org/software/sonypi/${P}.tar.bz2"
-S=${WORKDIR}/${P}
+
 SLOT="0"
-KEYWORDS="x86"
+LICENSE="GPL-2"
+KEYWORDS="x86 -ppc -sparc -sparc64"
+
+DEPEND=""
 
 src_compile() {
 	emake CFLAGS="${CFLAGS} -Wall -Wstrict-prototypes" || die
diff --git a/app-misc/splitvt/splitvt-1.6.5.ebuild b/app-misc/splitvt/splitvt-1.6.5.ebuild
index 9ee6385d20ea..88daa6c93a5f 100644
--- a/app-misc/splitvt/splitvt-1.6.5.ebuild
+++ b/app-misc/splitvt/splitvt-1.6.5.ebuild
@@ -1,40 +1,35 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-misc/splitvt/splitvt-1.6.5.ebuild,v 1.4 2002/07/11 06:30:16 drobbins Exp $
-
-S=${WORKDIR}/splitvt-1.6.5
-SRC_URI="http://www.devolution.com/~slouken/projects/splitvt/splitvt-1.6.5.tar.gz"
+# $Header: /var/cvsroot/gentoo-x86/app-misc/splitvt/splitvt-1.6.5.ebuild,v 1.5 2002/07/25 19:18:34 seemant Exp $
 
+S=${WORKDIR}/${P}
+SRC_URI="http://www.devolution.com/~slouken/projects/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.devolution.com/~slouken/projects/splitvt"
-
 DESCRIPTION="A program for splitting terminals into two shells"
 
-DEPEND="virtual/glibc >=sys-libs/ncurses-5.2"
-
-src_unpack() {
-    
-    unpack ${A}
-    cd ${S}
-    cp config.c config.orig
-    cat config.orig | sed "s:/usr/local/bin:${D}/usr/bin:g" > config.c
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
 
+DEPEND=">=sys-libs/ncurses-5.2"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	cp config.c config.orig
+	cat config.orig | sed "s:/usr/local/bin:${D}/usr/bin:g" > config.c
 }
 
 src_compile() {
-
-    try ./configure
-    cp Makefile Makefile.orig
-    sed -e "s:-O2:${CFLAGS}:" Makefile.orig > Makefile
-    try make
-
+	./configure || die
+	cp Makefile Makefile.orig
+	sed -e "s:-O2:${CFLAGS}:" Makefile.orig > Makefile
+	make || die
 }
 
 src_install() {
-
-    dodir /usr/bin
-    try make install
-    dodoc ANNOUNCE BLURB CHANGES NOTES README TODO
-    doman splitvt.1
-
+	dodir /usr/bin
+	make install || die
+	dodoc ANNOUNCE BLURB CHANGES NOTES README TODO
+	doman splitvt.1
 }
diff --git a/app-misc/sqeed/sqeed-0.2.2.ebuild b/app-misc/sqeed/sqeed-0.2.2.ebuild
index 1634efcd5352..4ac9773fac6a 100644
--- a/app-misc/sqeed/sqeed-0.2.2.ebuild
+++ b/app-misc/sqeed/sqeed-0.2.2.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-misc/sqeed/sqeed-0.2.2.ebuild,v 1.2 2002/07/11 06:30:16 drobbins Exp $
-
-# This ebuild was generated by Ebuilder v0.4.
+# $Header: /var/cvsroot/gentoo-x86/app-misc/sqeed/sqeed-0.2.2.ebuild,v 1.3 2002/07/25 19:18:34 seemant Exp $
 
 S="${WORKDIR}/${P}"
 DESCRIPTION="A simple bash script holding a database with notes."
 SRC_URI="http://areanaos.cjb.net/${P}.tar.gz"
 HOMEPAGE="http://areanaos.cjb.net/scode.html"
+
+SLOT="0"
 LICENSE="GPL-2"
+KEYWORDS="x86"
+
 DEPEND="sys-apps/bash"
-RDEPEND="${DEPEND}"
 
 src_compile() {
 	echo "Nothing to compile for ${P}."
diff --git a/app-misc/tinyca/tinyca-0.3.4.ebuild b/app-misc/tinyca/tinyca-0.3.4.ebuild
index f23d0e86b21d..22ea9402bad2 100644
--- a/app-misc/tinyca/tinyca-0.3.4.ebuild
+++ b/app-misc/tinyca/tinyca-0.3.4.ebuild
@@ -1,14 +1,16 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tinyca/tinyca-0.3.4.ebuild,v 1.3 2002/07/11 06:30:16 drobbins Exp $
-
-# This ebuild was generated by Ebuilder v0.4.
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tinyca/tinyca-0.3.4.ebuild,v 1.4 2002/07/25 19:18:34 seemant Exp $
 
 S="${WORKDIR}/TinyCA"
 DESCRIPTION="Simple Perl/Tk GUI to manage a small certification authority"
 SRC_URI="http://tinyca.sm-zone.net/${P}.tar.bz2"
 HOMEPAGE="http://tinyca.sm-zone.net"
+
+SLOT="0"
 LICENSE="Artistic"
+KEYWORDS="x86"
+
 DEPEND=">=dev-libs/openssl-0.9.6b
 	>=dev-perl/MIME-Base64-2.12
 	>=dev-perl/perl-tk-800.024
@@ -37,5 +39,4 @@ src_install () {
 	doins lib/*
 	insinto /usr/share/tinyca/templates
 	doins templates/*
-	
 }
diff --git a/app-misc/todo-manager-bronze/todo-manager-bronze-20020711.ebuild b/app-misc/todo-manager-bronze/todo-manager-bronze-20020711.ebuild
index 4160e91535a0..3d98713079b4 100644
--- a/app-misc/todo-manager-bronze/todo-manager-bronze-20020711.ebuild
+++ b/app-misc/todo-manager-bronze/todo-manager-bronze-20020711.ebuild
@@ -1,16 +1,18 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-misc/todo-manager-bronze/todo-manager-bronze-20020711.ebuild,v 1.1 2002/07/11 18:35:19 bass Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/todo-manager-bronze/todo-manager-bronze-20020711.ebuild,v 1.2 2002/07/25 19:18:35 seemant Exp $
 
 S="${WORKDIR}/${PN}"
 DESCRIPTION="A task manager."
 SRC_URI="mirror://sourceforge/todo-manager/${P}.tar.gz"
 HOMEPAGE="todo-manager.sourceforge.net"
+
+SLOT="0"
 LICENSE="GPL-2"
+KEYWORDS="x86"
+
 DEPEND="dev-lang/python
-		dev-lang/tk"
-RDEPEND="${RDEPEND}"
-SLOT="0"
+	dev-lang/tk"
 
 src_compile() {
 	python setup.py clean || die
diff --git a/app-misc/toshiba-utils/toshiba-utils-2.0.1-r1.ebuild b/app-misc/toshiba-utils/toshiba-utils-2.0.1-r1.ebuild
index 28ed77912f2e..edaf2c38c9eb 100644
--- a/app-misc/toshiba-utils/toshiba-utils-2.0.1-r1.ebuild
+++ b/app-misc/toshiba-utils/toshiba-utils-2.0.1-r1.ebuild
@@ -1,15 +1,17 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-misc/toshiba-utils/toshiba-utils-2.0.1-r1.ebuild,v 1.1 2002/05/04 01:22:37 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/toshiba-utils/toshiba-utils-2.0.1-r1.ebuild,v 1.2 2002/07/25 19:18:35 seemant Exp $
 
+S=${WORKDIR}/toshutils-${PV}
 DESCRIPTION="Toshiba Laptop Utilities"
 HOMEPAGE="http://www.buzzard.org.uk/toshiba/"
-
-S=${WORKDIR}/toshutils-${PV}
 SRC_URI="http://www.buzzard.org.uk/toshiba/toshutils-${PV}.tar.gz"
-DEPEND="virtual/glibc X? ( =x11-libs/gtk+-1* )"
-LICENSE="GPL-2"
+
 SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 -ppc -sparc -sparc64"
+
+DEPEND="gtk? ( =x11-libs/gtk+-1* )"
 
 src_unpack() {
 	unpack ${A} ; cd ${S}
diff --git a/app-misc/twin/twin-0.2.8.ebuild b/app-misc/twin/twin-0.2.8.ebuild
index 3cc1300e3475..4de2090a53ca 100644
--- a/app-misc/twin/twin-0.2.8.ebuild
+++ b/app-misc/twin/twin-0.2.8.ebuild
@@ -1,61 +1,61 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-misc/twin/twin-0.2.8.ebuild,v 1.5 2002/07/11 06:30:16 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/twin/twin-0.2.8.ebuild,v 1.6 2002/07/25 19:18:35 seemant Exp $
 
-
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="A text-mode window environment"
-SRC_URI="http://ftp1.sourceforge.net/twin/${A}
-	 http://linuz.sns.it/~max/twin/${A}"
+SRC_URI="http://ftp1.sourceforge.net/twin/${P}.tar.gz
+	 http://linuz.sns.it/~max/twin/${P}.tar.gz"
 HOMEPAGE="http://linuz.sns.it/~max/twin/" 
-DEPEND="virtual/glibc
-	X? ( virtual/x11 )
-        >=sys-libs/ncurses-5.2"
+
+SLOT="0"
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS="x86"
+
+DEPEND="X? ( virtual/x11 )
+	>=sys-libs/ncurses-5.2"
 
 src_unpack() {
-   unpack ${A}
-   cd ${S}
-   try patch -p1 < ${FILESDIR}/${PF}-gentoo.diff
+	unpack ${A}
+	cd ${S}
+	patch -p1 < ${FILESDIR}/${PF}-gentoo.diff || die
 }
 
 src_compile() {
-   local conf
-   
-   conf="\n\n\n\n\n\n\n\n"
-   if [ "`use X`" ]
-   then
-      conf=${conf}"y\n"
-   else
-      conf=${conf}"n\n"
-   fi
-   conf=${conf}"\n\n\n\n\n"
-   echo -e ${conf} > .temp
-   cat .temp | make config
-   rm .temp
-   try make clean
-   try make 
+	local conf
+	
+	conf="\n\n\n\n\n\n\n\n"
+	use X \
+		&& conf=${conf}"y\n" \
+		|| conf=${conf}"n\n"
+
+	conf=${conf}"\n\n\n\n\n"
+	echo -e ${conf} > .temp
+	cat .temp | make config
+	rm .temp
+	make clean || die
+	make  || die
 }
 
 src_install() {
-   
-   dodir /usr/lib /usr/bin /usr/lib/ /usr/include
+	
+	dodir /usr/lib /usr/bin /usr/lib/ /usr/include
 
-   dobin server/twin_real server/twin_wrapper
-   dobin clients/twsetroot clients/twevent clients/twmapscrn \
-         clients/twedit clients/twterm clients/twattach clients/twsysmon
+	dobin server/twin_real server/twin_wrapper
+	dobin clients/twsetroot clients/twevent clients/twmapscrn \
+			clients/twedit clients/twterm clients/twattach clients/twsysmon
 
-   dolib lib/libTw.so.1.0.0 
+	dolib lib/libTw.so.1.0.0 
 
-   insinto /usr/include
-     doins include/libTwkeys.h include/libTw.h include/libTwerrno.h
+	insinto /usr/include
+		doins include/libTwkeys.h include/libTw.h include/libTwerrno.h
 
-   dosym /usr/bin/twin_wrapper /usr/bin/twin
-   dosym /usr/bin/twattach /usr/bin/twdetach
-   dosym /usr/lib/libTw.so.1.0.0 /usr/lib/libTw.so.1
-   dosym /usr/lib/libTw.so.1 /usr/lib/libTw.so
+	dosym /usr/bin/twin_wrapper /usr/bin/twin
+	dosym /usr/bin/twattach /usr/bin/twdetach
+	dosym /usr/lib/libTw.so.1.0.0 /usr/lib/libTw.so.1
+	dosym /usr/lib/libTw.so.1 /usr/lib/libTw.so
 
-   dodoc BUGS COPYING COPYING.LIB INSTALL README TODO Changelog.txt ${P}.lsm
-   docinto clients
-     dodoc clients/README.twsetroot clients/twsetroot.sample
+	dodoc BUGS COPYING COPYING.LIB INSTALL README TODO Changelog.txt ${P}.lsm
+	docinto clients
+	dodoc clients/README.twsetroot clients/twsetroot.sample
 }
diff --git a/app-misc/twin/twin-0.3.8-r1.ebuild b/app-misc/twin/twin-0.3.8-r1.ebuild
index a0af8e5bde30..9b9794312b6e 100644
--- a/app-misc/twin/twin-0.3.8-r1.ebuild
+++ b/app-misc/twin/twin-0.3.8-r1.ebuild
@@ -1,15 +1,18 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-misc/twin/twin-0.3.8-r1.ebuild,v 1.7 2002/07/11 06:30:16 drobbins Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/app-misc/twin/twin-0.3.8-r1.ebuild,v 1.8 2002/07/25 19:18:35 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A text-mode window environment"
 SRC_URI="http://ftp1.sourceforge.net/twin/${P}.tar.gz
 	http://linuz.sns.it/~max/twin/${P}.tar.gz"
 HOMEPAGE="http://linuz.sns.it/~max/twin/" 
-DEPEND="virtual/glibc
-	X? ( virtual/x11 )
+
+SLOT="0"
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS="x86"
+
+DEPEND="X? ( virtual/x11 )
 	ggi? ( >=media-libs/libggi-1.9 )
 	>=sys-libs/gpm-1.19.3
 	>=sys-libs/ncurses-5.2"
diff --git a/app-misc/uptimed/uptimed-0.2.0-r1.ebuild b/app-misc/uptimed/uptimed-0.2.0-r1.ebuild
index 0fb03fffac93..6deea81454f9 100644
--- a/app-misc/uptimed/uptimed-0.2.0-r1.ebuild
+++ b/app-misc/uptimed/uptimed-0.2.0-r1.ebuild
@@ -1,21 +1,22 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/uptimed/uptimed-0.2.0-r1.ebuild,v 1.1 2002/07/19 20:50:24 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/uptimed/uptimed-0.2.0-r1.ebuild,v 1.2 2002/07/25 19:18:35 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Standard informational utilities and process-handling tools"
 SRC_URI="http://telia.dl.sourceforge.net/sourceforge/uptimed/${P}.tar.bz2"
 HOMEPAGE="http://unixcode.org/uptimed"
-DEPEND="virtual/glibc"
-RDEPEND="${DEPEND}"
+
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86"
 
+DEPEND="virtual/glibc"
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	patch -p1 <${FILESDIR}/${P}.patch
+	patch -p1 <${FILESDIR}/${P}.patch || die
 }
 
 src_compile() {
diff --git a/app-misc/upx/upx-1.21.ebuild b/app-misc/upx/upx-1.21.ebuild
index 33a2591b7add..2f8c5d66602a 100644
--- a/app-misc/upx/upx-1.21.ebuild
+++ b/app-misc/upx/upx-1.21.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-misc/upx/upx-1.21.ebuild,v 1.3 2002/07/11 06:30:16 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/upx/upx-1.21.ebuild,v 1.4 2002/07/25 19:18:35 seemant Exp $
 
 DESCRIPTION="upx is the Ultimate Packer for eXecutables"
 SRC_URI="http://upx.sourceforge.net/download/${P}-src.tar.gz"
 HOMEPAGE="http://upx.sourceforge.net/"
-LICENSE="GPL-2"
+
 SLOT="0"
+LICENSE="GPL-2"
 KEYWORDS="x86"
 
 DEPEND="=dev-libs/ucl-1.01"
-RDEPEND=${DEPEND}
 
 src_compile() {
 	cd ${S}/src
@@ -24,4 +24,3 @@ src_compile() {
 src_install() {
 	dobin ${S}/src/upx
 }
-
diff --git a/app-misc/upx/upx-1.22.ebuild b/app-misc/upx/upx-1.22.ebuild
index f7412d56e5a5..0eadea2a7f5c 100644
--- a/app-misc/upx/upx-1.22.ebuild
+++ b/app-misc/upx/upx-1.22.ebuild
@@ -5,12 +5,12 @@ S=${WORKDIR}/${P}
 DESCRIPTION="upx is the Ultimate Packer for eXecutables."
 SRC_URI="http://upx.sourceforge.net/download/${P}-src.tar.gz"
 HOMEPAGE="http://upx.sourceforge.net/"
-LICENSE="GPL-2"
+
 SLOT="0"
+LICENSE="GPL-2"
 KEYWORDS="x86"
 
 DEPEND="=dev-libs/ucl-1.01"
-RDEPEND=${DEPEND}
 
 src_compile() {
 	cd ${S}/src
@@ -25,4 +25,3 @@ src_install() {
 	dobin ${S}/src/upx
 	dodoc BUGS COPYING LICENSE LOADER.TXT NEWS PROJECTS README README.SRC THANKS
 }
-
diff --git a/app-misc/vlock/vlock-1.3-r1.ebuild b/app-misc/vlock/vlock-1.3-r1.ebuild
index 8f466a93c798..51de501cb3b3 100644
--- a/app-misc/vlock/vlock-1.3-r1.ebuild
+++ b/app-misc/vlock/vlock-1.3-r1.ebuild
@@ -1,12 +1,16 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-misc/vlock/vlock-1.3-r1.ebuild,v 1.2 2002/07/11 06:30:16 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/vlock/vlock-1.3-r1.ebuild,v 1.3 2002/07/25 19:18:35 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A console screen locker"
-
 SRC_URI="ftp://ftp.ibiblio.org/pub/Linux/utils/console/vlock-1.3.tar.gz"
-HOMEPAGE="http://"
+HOMEPAGE="ftp://ftp.ibiblio.org/pub/Linux/utils/console/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
 DEPEND="virtual/glibc"
 
 src_compile() {
diff --git a/app-misc/vlock/vlock-1.3.ebuild b/app-misc/vlock/vlock-1.3.ebuild
index 5814537d8d59..3c8ab75bea86 100644
--- a/app-misc/vlock/vlock-1.3.ebuild
+++ b/app-misc/vlock/vlock-1.3.ebuild
@@ -1,17 +1,21 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-misc/vlock/vlock-1.3.ebuild,v 1.2 2002/07/11 06:30:17 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/vlock/vlock-1.3.ebuild,v 1.3 2002/07/25 19:18:35 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A console screen locker"
-
 SRC_URI="ftp://ftp.ibiblio.org/pub/Linux/utils/console/vlock-1.3.tar.gz"
-HOMEPAGE="http://"
+HOMEPAGE="ftp://ftp.ibiblio.org/pub/Linux/utils/console/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
 DEPEND="virtual/glibc"
 
 src_compile() {
 	cd ${S}
-	try make RPM_OPT_FLAGS="${CFLAGS}"
+	make RPM_OPT_FLAGS="${CFLAGS}" || die
 }
 
 src_install () {
@@ -20,4 +24,3 @@ src_install () {
 	doman vlock.1
 	dodoc COPYING README
 }
-
diff --git a/app-misc/wmmon+smp/wmmon+smp-1.0-r1.ebuild b/app-misc/wmmon+smp/wmmon+smp-1.0-r1.ebuild
index e568d25f862c..6cf4b3336208 100644
--- a/app-misc/wmmon+smp/wmmon+smp-1.0-r1.ebuild
+++ b/app-misc/wmmon+smp/wmmon+smp-1.0-r1.ebuild
@@ -1,7 +1,6 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-misc/wmmon+smp/wmmon+smp-1.0-r1.ebuild,v 1.2 2002/07/11 06:30:17 drobbins Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/app-misc/wmmon+smp/wmmon+smp-1.0-r1.ebuild,v 1.3 2002/07/25 19:18:35 seemant Exp $
 
 S=${WORKDIR}/wmmon.app
 S2=${S}/wmmon
@@ -9,19 +8,19 @@ DESCRIPTION="Dockapp CPU monitor resembling Xosview, support for smp"
 SRC_URI="http://www.ne.jp/asahi/linux/timecop/wmmon+smp.tar.gz"
 HOMEPAGE="http://www.ne.jp/asahi/linux/timecop/"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
 DEPEND="virtual/x11"
 
 src_compile() {
-
 	cd ${S2}
-	try emake
-
+	emake || die
 }
 
 src_install () {
-
 	exeinto /usr/bin
 	doexe ${S2}/wmmon
 	dodoc ${S}/README ${S}/COPYING ${S}/INSTALL
-
 }
diff --git a/app-misc/worker/worker-2.3.1.ebuild b/app-misc/worker/worker-2.3.1.ebuild
index 94f6188c8ea3..4c0015c4bd7b 100644
--- a/app-misc/worker/worker-2.3.1.ebuild
+++ b/app-misc/worker/worker-2.3.1.ebuild
@@ -1,33 +1,25 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-misc/worker/worker-2.3.1.ebuild,v 1.2 2002/07/11 06:30:17 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/worker/worker-2.3.1.ebuild,v 1.3 2002/07/25 19:18:35 seemant Exp $
 
 S=${WORKDIR}/${P}
-
 DESCRIPTION="Worker Filemanager: Amiga Directory Opus 4 clone."
-
 SRC_URI="http://www.boomerangsworld.de/worker/downloads/${P}.tar.bz2"
-
 HOMEPAGE="http://www.boomerangsworld.de/worker"
 
-DEPEND="virtual/x11"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
 
+DEPEND="virtual/x11"
 
 src_compile() {
-
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man || die "./configure failed"
-
+	econf || die
 	emake || die "Parallel make failed"
-
 }
 
 src_install () {
- 
 	make DESTDIR=${D} install || die "Installation failed"
 
 	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS
-
 }
diff --git a/app-misc/xbatt/xbatt-1.2.1.ebuild b/app-misc/xbatt/xbatt-1.2.1.ebuild
index 101ec6dc4669..ab7bfd3912fc 100644
--- a/app-misc/xbatt/xbatt-1.2.1.ebuild
+++ b/app-misc/xbatt/xbatt-1.2.1.ebuild
@@ -1,12 +1,16 @@
 # Copyright 2001-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-misc/xbatt/xbatt-1.2.1.ebuild,v 1.3 2002/07/11 06:30:17 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/xbatt/xbatt-1.2.1.ebuild,v 1.4 2002/07/25 19:18:35 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Notebook battery indicataor for X"
 SRC_URI="http://www.clave.gr.jp/~eto/xbatt/${P}.tar.gz"
 HOMEPAGE="http://www.clave.gr.jp/~eto/xbatt/"
 
+SLOT="0"
+LICENSE="as-is|BSD"
+KEYWORDS="x86"
+
 DEPEND="virtual/x11"
 
 src_compile() {
diff --git a/app-misc/xclip/xclip-0.05.ebuild b/app-misc/xclip/xclip-0.05.ebuild
index 492591a6f6b3..029f397ec6a6 100644
--- a/app-misc/xclip/xclip-0.05.ebuild
+++ b/app-misc/xclip/xclip-0.05.ebuild
@@ -1,7 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Grant Goodyear <grant@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-misc/xclip/xclip-0.05.ebuild,v 1.2 2002/04/27 07:39:05 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/xclip/xclip-0.05.ebuild,v 1.3 2002/07/25 19:18:35 seemant Exp $
 
 S=${WORKDIR}/xclip
 DESCRIPTION="Command-line utility to read data from standard in and
@@ -9,6 +8,10 @@ DESCRIPTION="Command-line utility to read data from standard in and
 SRC_URI="http://people.debian.org/~kims/xclip/${P}.tar.gz"
 HOMEPAGE="http://people.debian.org/~kims/xclip"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
 DEPEND="virtual/x11"
 
 src_compile() {
diff --git a/app-misc/xclip/xclip-0.08.ebuild b/app-misc/xclip/xclip-0.08.ebuild
index 2cb8c056f3fe..1674fc5875f5 100644
--- a/app-misc/xclip/xclip-0.08.ebuild
+++ b/app-misc/xclip/xclip-0.08.ebuild
@@ -1,7 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Grant Goodyear <grant@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-misc/xclip/xclip-0.08.ebuild,v 1.1 2002/04/27 07:41:31 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/xclip/xclip-0.08.ebuild,v 1.2 2002/07/25 19:18:35 seemant Exp $
 
 S=${WORKDIR}/xclip
 DESCRIPTION="Command-line utility to read data from standard in and
@@ -9,19 +8,19 @@ DESCRIPTION="Command-line utility to read data from standard in and
 SRC_URI="http://people.debian.org/~kims/xclip/${P}.tar.gz"
 HOMEPAGE="http://people.debian.org/~kims/xclip"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
 DEPEND="virtual/x11"
 
 src_compile() {
-
 	xmkmf || die
 	make || die
-
 }
 
 src_install () {
-
 	make DESTDIR=${D} install || die
 	make DESTDIR=${D} install.man || die
 	dodoc README INSTALL CHANGES
-
 }
diff --git a/app-misc/xlockmore/files/digest-xlockmore-5.03-r2 b/app-misc/xlockmore/files/digest-xlockmore-5.03-r2
deleted file mode 100644
index 0c8cf283098a..000000000000
--- a/app-misc/xlockmore/files/digest-xlockmore-5.03-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3f3a30c92e4d241dd81c6059f2724c55 xlockmore-5.03.tar.gz 1730062
diff --git a/app-misc/xlockmore/files/digest-xlockmore-5.03-r3 b/app-misc/xlockmore/files/digest-xlockmore-5.03-r3
deleted file mode 100644
index 0c8cf283098a..000000000000
--- a/app-misc/xlockmore/files/digest-xlockmore-5.03-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3f3a30c92e4d241dd81c6059f2724c55 xlockmore-5.03.tar.gz 1730062
diff --git a/app-misc/xlockmore/files/digest-xlockmore-5.03-r4 b/app-misc/xlockmore/files/digest-xlockmore-5.03-r4
deleted file mode 100644
index 0c8cf283098a..000000000000
--- a/app-misc/xlockmore/files/digest-xlockmore-5.03-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3f3a30c92e4d241dd81c6059f2724c55 xlockmore-5.03.tar.gz 1730062
diff --git a/app-misc/xlockmore/files/digest-xlockmore-5.03-r5 b/app-misc/xlockmore/files/digest-xlockmore-5.03-r5
deleted file mode 100644
index 0c8cf283098a..000000000000
--- a/app-misc/xlockmore/files/digest-xlockmore-5.03-r5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3f3a30c92e4d241dd81c6059f2724c55 xlockmore-5.03.tar.gz 1730062
diff --git a/app-misc/xlockmore/xlockmore-5.03-r2.ebuild b/app-misc/xlockmore/xlockmore-5.03-r2.ebuild
deleted file mode 100644
index 94c9b71008b9..000000000000
--- a/app-misc/xlockmore/xlockmore-5.03-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-misc/xlockmore/xlockmore-5.03-r2.ebuild,v 1.1 2002/03/06 23:38:24 g2boojum Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Just another screensaver application for X"
-SRC_URI="ftp://ftp.tux.org/pub/tux/bagleyd/xlockmore/${P}.tar.gz"
-HOMEPAGE="http://www.tux.org/~bagleyd/xlockmore.html"
-
-DEPEND="virtual/x11 media-libs/freetype
-	opengl? ( virtual/opengl )
-	pam? ( sys-libs/pam )
-	nas? ( media-libs/nas )
-	esd? ( media-sound/esound )"
-	# motif? ( >=x11-libs/openmotif-2.1.30-r1 )
-	# gtk? ( x11-libs/gtk+ )
-
-src_compile() {
-
-	local myconf
-
-	use pam && myconf="--enable-pam"
-	use nas || myconf="${myconf} --without-nas"
-	use esd && myconf="${myconf} --with-esound"
-	use opengl || myconf="${myconf} --without-opengl"
-	#use motif || myconf="${myconf} --without-motif"
-	#use gtk || myconf="${myconf} --without-gtk"
-	# sigh... broken configure script and/or makefile...
-	myconf="${myconf} --without-motif --without-gtk"
-
-	./configure --prefix=/usr --mandir=${prefix}/man/man1 \
-		--sharedstatedir=/usr/share/xlockmore --host=${CHOST} ${myconf} || die
-
-	emake || die
-
-	# configure script seems to suffer braindamage and doesn't setup
-	# correct makefiles for these, so they are disabled for now until
-	# some kind soul wants to submit a patch ;)
-
-	#if [ "`use gtk`" ] ; then
-	#	cd ${S}/xglock
-	#	make all || die
-	#fi
-
-	#if [ "`use motif`" ] ; then
-	#	cd ${S}/xmlock
-	#	make all || die
-	#fi
-
-    
-}
-
-src_install () {
-
-	make prefix=${D}/usr mandir=${D}/usr/man/man1 xapploaddir=${D}/usr/X11R6/lib/X11/app-defaults install || die
-
-	exeinto /usr/bin
-
-	# known issue: how do you tell xlock where its sounds are?
-	insinto /usr/share/xlockmore
-	doins sounds/*
-
-#	use motif && doexe ${S}/xmlock/xmlock 
-#	use gtk && doexe ${S}/xglock/xglock
-
-	dodoc docs/* README 
-#	use gtk && dodoc xglock/xglockrc xglock/README.xglock
-
-}
diff --git a/app-misc/xlockmore/xlockmore-5.03-r3.ebuild b/app-misc/xlockmore/xlockmore-5.03-r3.ebuild
deleted file mode 100644
index b0278d130c5c..000000000000
--- a/app-misc/xlockmore/xlockmore-5.03-r3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-misc/xlockmore/xlockmore-5.03-r3.ebuild,v 1.1 2002/03/27 21:32:33 seemant Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Just another screensaver application for X"
-SRC_URI="ftp://ftp.tux.org/pub/tux/bagleyd/xlockmore/${P}.tar.gz"
-HOMEPAGE="http://www.tux.org/~bagleyd/xlockmore.html"
-
-DEPEND="virtual/x11 media-libs/freetype
-	opengl? ( virtual/opengl )
-	pam? ( sys-libs/pam )
-	nas? ( media-libs/nas )
-	esd? ( media-sound/esound )"
-	# motif? ( >=x11-libs/openmotif-2.1.30-r1 )
-	# gtk? ( x11-libs/gtk+ )
-
-src_compile() {
-
-	local myconf
-
-	use pam && myconf="--enable-pam"
-	use nas || myconf="${myconf} --without-nas"
-	use esd && myconf="${myconf} --with-esound"
-	use opengl || myconf="${myconf} --without-opengl"
-	#use motif || myconf="${myconf} --without-motif"
-	#use gtk || myconf="${myconf} --without-gtk"
-	# sigh... broken configure script and/or makefile...
-	myconf="${myconf} --without-motif --without-gtk"
-
-	./configure 	\
-		--prefix=/usr	\
-		--mandir=${prefix}/share/man/man1	\
-		--sharedstatedir=/usr/share/xlockmore 	\
-		--host=${CHOST}	\
-		${myconf} || die
-
-	emake || die
-
-	# configure script seems to suffer braindamage and doesn't setup
-	# correct makefiles for these, so they are disabled for now until
-	# some kind soul wants to submit a patch ;)
-
-	#if [ "`use gtk`" ] ; then
-	#	cd ${S}/xglock
-	#	make all || die
-	#fi
-
-	#if [ "`use motif`" ] ; then
-	#	cd ${S}/xmlock
-	#	make all || die
-	#fi
-
-    
-}
-
-src_install () {
-
-	make 	\
-		prefix=${D}/usr	\
-		mandir=${D}/usr/share/man/man1	\
-		xapploaddir=${D}/usr/X11R6/lib/X11/app-defaults	\
-		install || die
-
-	exeinto /usr/bin
-
-	# known issue: how do you tell xlock where its sounds are?
-	insinto /usr/share/xlockmore
-	doins sounds/*
-
-#	use motif && doexe ${S}/xmlock/xmlock 
-#	use gtk && doexe ${S}/xglock/xglock
-
-	dodoc docs/* README 
-#	use gtk && dodoc xglock/xglockrc xglock/README.xglock
-
-}
diff --git a/app-misc/xlockmore/xlockmore-5.03-r4.ebuild b/app-misc/xlockmore/xlockmore-5.03-r4.ebuild
deleted file mode 100644
index 8712f90f4d5d..000000000000
--- a/app-misc/xlockmore/xlockmore-5.03-r4.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-misc/xlockmore/xlockmore-5.03-r4.ebuild,v 1.2 2002/07/11 06:30:17 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Just another screensaver application for X"
-SRC_URI="ftp://ftp.tux.org/pub/tux/bagleyd/xlockmore/${P}.tar.gz"
-HOMEPAGE="http://www.tux.org/~bagleyd/xlockmore.html"
-
-DEPEND="virtual/x11 media-libs/freetype
-	opengl? ( virtual/opengl )
-	pam? ( sys-libs/pam )
-	nas? ( media-libs/nas )
-	esd? ( media-sound/esound )"
-	# motif? ( >=x11-libs/openmotif-2.1.30-r1 )
-	# gtk? ( x11-libs/gtk+ )
-
-src_compile() {
-
-	local myconf
-
-	use pam \
-		&& myconf="${myconf} --enable-pam" \
-		|| myconf="${myconf} --disable-pam --enable-xlockrc"
-
-	use nas \
-		|| myconf="${myconf} --without-nas"
-
-	use esd \
-		&& myconf="${myconf} --with-esound"
-
-	use opengl \
-		|| myconf="${myconf} --without-opengl"
-
-	use truetype \
-		|| myconf="${myconf} --without-ttf"
-
-	use esd \
-		&& myconf="${myconf} --with-esound"
-
-	#use motif || myconf="${myconf} --without-motif"
-	#use gtk || myconf="${myconf} --without-gtk"
-	# sigh... broken configure script and/or makefile...
-	myconf="${myconf} --without-motif --without-gtk"
-
-	./configure 	\
-		--prefix=/usr	\
-		--mandir=${prefix}/share/man/man1	\
-		--sharedstatedir=/usr/share/xlockmore 	\
-		--host=${CHOST}	\
-		${myconf} || die
-
-	emake || die
-
-	# configure script seems to suffer braindamage and doesn't setup
-	# correct makefiles for these, so they are disabled for now until
-	# some kind soul wants to submit a patch ;)
-
-	#if [ "`use gtk`" ] ; then
-	#	cd ${S}/xglock
-	#	make all || die
-	#fi
-
-	#if [ "`use motif`" ] ; then
-	#	cd ${S}/xmlock
-	#	make all || die
-	#fi
-
-    
-}
-
-src_install () {
-
-	make 	\
-		prefix=${D}/usr	\
-		mandir=${D}/usr/share/man/man1	\
-		xapploaddir=${D}/usr/X11R6/lib/X11/app-defaults	\
-		install || die
-
-	exeinto /usr/bin
-
-	# known issue: how do you tell xlock where its sounds are?
-	insinto /usr/share/xlockmore
-	doins sounds/*
-
-#	use motif && doexe ${S}/xmlock/xmlock 
-#	use gtk && doexe ${S}/xglock/xglock
-
-	dodoc docs/* README 
-#	use gtk && dodoc xglock/xglockrc xglock/README.xglock
-
-}
diff --git a/app-misc/xlockmore/xlockmore-5.03-r5.ebuild b/app-misc/xlockmore/xlockmore-5.03-r5.ebuild
deleted file mode 100644
index bb978c62f483..000000000000
--- a/app-misc/xlockmore/xlockmore-5.03-r5.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-misc/xlockmore/xlockmore-5.03-r5.ebuild,v 1.5 2002/07/11 06:30:17 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Just another screensaver application for X"
-SRC_URI="ftp://ftp.tux.org/pub/tux/bagleyd/xlockmore/${P}.tar.gz"
-HOMEPAGE="http://www.tux.org/~bagleyd/xlockmore.html"
-
-DEPEND="virtual/x11 media-libs/freetype
-	opengl? ( virtual/opengl )
-	pam? ( sys-libs/pam )
-	nas? ( media-libs/nas )
-	esd? ( media-sound/esound )"
-	# motif? ( >=x11-libs/openmotif-2.1.30-r1 )
-	# gtk? ( x11-libs/gtk+ )
-
-src_compile() {
-	local myconf
-	use pam && myconf="${myconf} --enable-pam" \
-		|| myconf="${myconf} --disable-pam --enable-xlockrc"
-	use nas || myconf="${myconf} --without-nas"
-	use esd && myconf="${myconf} --with-esound"
-	use opengl || myconf="${myconf} --without-opengl --without-gltt --without-mesa"
-	use truetype || myconf="${myconf} --without-ttf"
-
-	#use motif || myconf="${myconf} --without-motif"
-	#use gtk || myconf="${myconf} --without-gtk"
-	# sigh... broken configure script and/or makefile...
-	myconf="${myconf} --without-motif --without-gtk"
-
-	./configure \
-		--prefix=/usr \
-		--mandir=${prefix}/share/man/man1 \
-		--sharedstatedir=/usr/share/xlockmore \
-		--host=${CHOST} ${myconf} || die
-
-	#xlock resets to -j1
-	make || die
-
-	# configure script seems to suffer braindamage and doesn't setup
-	# correct makefiles for these, so they are disabled for now until
-	# some kind soul wants to submit a patch ;)
-
-	#if [ "`use gtk`" ] ; then
-	#	cd ${S}/xglock
-	#	make all || die
-	#fi
-
-	#if [ "`use motif`" ] ; then
-	#	cd ${S}/xmlock
-	#	make all || die
-	#fi
-}
-
-src_install() {
-	make install \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man/man1 \
-		xapploaddir=${D}/usr/X11R6/lib/X11/app-defaults || die
-
-	#Install pam.d file and unset setuid root 
-	if use pam; then
-		insinto /etc/pam.d
-		newins etc/xlock.pamd xlock
-		chmod 111 ${D}/usr/bin/xlock
-	fi
-
-	insinto /usr/share/xlockmore/sounds
-	doins sounds/*
-
-#	use motif && doexe ${S}/xmlock/xmlock 
-#	use gtk && doexe ${S}/xglock/xglock
-
-	dodoc docs/* README 
-	dohtml docs/*.html
-	rm ${D}/usr/share/doc/${PF}/*.html.gz
-#	use gtk && dodoc xglock/xglockrc xglock/README.xglock
-}
diff --git a/app-misc/xlockmore/xlockmore-5.04.ebuild b/app-misc/xlockmore/xlockmore-5.04.ebuild
index e8b4dc971b76..32305a093ac7 100644
--- a/app-misc/xlockmore/xlockmore-5.04.ebuild
+++ b/app-misc/xlockmore/xlockmore-5.04.ebuild
@@ -1,13 +1,18 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-misc/xlockmore/xlockmore-5.04.ebuild,v 1.3 2002/07/11 06:30:17 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/xlockmore/xlockmore-5.04.ebuild,v 1.4 2002/07/25 19:18:35 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Just another screensaver application for X"
 SRC_URI="http://www.tux.org/~bagleyd/latest/xlockmore-5.04.tar.bz2"
 HOMEPAGE="http://www.tux.org/~bagleyd/xlockmore.html"
 
-DEPEND="virtual/x11 media-libs/freetype
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="x86"
+
+DEPEND="virtual/x11 
+	media-libs/freetype
 	opengl? ( virtual/opengl )
 	pam? ( sys-libs/pam )
 	nas? ( media-libs/nas )
diff --git a/app-misc/xosview/xosview-1.8.0.ebuild b/app-misc/xosview/xosview-1.8.0.ebuild
index e773c123d222..205d9e620d8f 100644
--- a/app-misc/xosview/xosview-1.8.0.ebuild
+++ b/app-misc/xosview/xosview-1.8.0.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-misc/xosview/xosview-1.8.0.ebuild,v 1.2 2002/07/24 22:42:37 gerk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/xosview/xosview-1.8.0.ebuild,v 1.3 2002/07/25 19:18:35 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="X11 operating system viewer"
 SRC_URI="http://www.ibiblio.org/pub/Linux/system/status/xstatus/${P}.tar.gz"
 HOMEPAGE="http://xosview.sourceforge.net"
+
+SLOT="0"
 LICENSE="GPL-2 BSD"
 KEYWORDS="x86 ppc"
-SLOT="0"
 
 DEPEND="virtual/x11"
 
@@ -23,7 +24,6 @@ src_compile() {
 }
 
 src_install () {
-
 	exeinto /usr/bin
 	doexe xosview
 	insinto /usr/lib/X11
@@ -31,5 +31,4 @@ src_install () {
 	doins XOsview
 	into /usr
 	doman *.1
-
 }
diff --git a/app-misc/xplore/files/digest-xplore-1.1 b/app-misc/xplore/files/digest-xplore-1.1
deleted file mode 100644
index 7d0f95cc76b0..000000000000
--- a/app-misc/xplore/files/digest-xplore-1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b3219824ad93279302ce890ac5038389 xplore-1.1.tar.bz2 361862
diff --git a/app-misc/xplore/xplore-1.1-r1.ebuild b/app-misc/xplore/xplore-1.1-r1.ebuild
index 8db4adc9159d..550779c7e830 100644
--- a/app-misc/xplore/xplore-1.1-r1.ebuild
+++ b/app-misc/xplore/xplore-1.1-r1.ebuild
@@ -1,15 +1,19 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-misc/xplore/xplore-1.1-r1.ebuild,v 1.2 2002/07/11 06:30:17 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/xplore/xplore-1.1-r1.ebuild,v 1.3 2002/07/25 19:18:35 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="motif file manager for X."
 SRC_URI="http://www.musikwissenschaft.uni-mainz.de/~ag/xplore/${P}.tar.bz2"
 HOMEPAGE="http://www.musikwissenschaft.uni-mainz.de/~ag/xplore/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
 DEPEND="virtual/x11
-		>=x11-libs/openmotif-2.1.30-r1"
+	>=x11-libs/openmotif-2.1.30-r1"
 
-#RDEPEND=""
 
 src_compile() {
 
@@ -28,9 +32,6 @@ src_compile() {
 
 src_install () {
 	
-	# try make prefix=${D}/usr install
-
-    make DESTDIR=${D} install || die "Installation failed"
-	 dodoc COPYING ChangeLog INSTALL README TODO
+	make DESTDIR=${D} install || die "Installation failed"
+	dodoc COPYING ChangeLog INSTALL README TODO
 }
-
diff --git a/app-misc/xplore/xplore-1.1.ebuild b/app-misc/xplore/xplore-1.1.ebuild
deleted file mode 100644
index 3cf94b332ecb..000000000000
--- a/app-misc/xplore/xplore-1.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-misc/xplore/xplore-1.1.ebuild,v 1.2 2002/07/11 06:30:17 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="motif file manager for X."
-SRC_URI="http://www.musikwissenschaft.uni-mainz.de/~ag/xplore/${P}.tar.bz2"
-HOMEPAGE="http://www.musikwissenschaft.uni-mainz.de/~ag/xplore/"
-DEPEND="virtual/x11"
-
-#RDEPEND=""
-
-src_compile() {
-
-	xmkmf -a || die
-   make || die
-	
-}
-
-src_install () {
-	
-	# try make prefix=${D}/usr install
-
-    try make DESTDIR=${D} install
-	 dodoc README INSTALL ChangeLog  
-}
-
diff --git a/app-misc/xplore/xplore-1.1e.ebuild b/app-misc/xplore/xplore-1.1e.ebuild
index 03fae462769f..c2263a93c7cc 100644
--- a/app-misc/xplore/xplore-1.1e.ebuild
+++ b/app-misc/xplore/xplore-1.1e.ebuild
@@ -1,18 +1,20 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-misc/xplore/xplore-1.1e.ebuild,v 1.2 2002/07/11 06:30:17 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/xplore/xplore-1.1e.ebuild,v 1.3 2002/07/25 19:18:35 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="motif file manager for X."
 SRC_URI="http://www.musikwissenschaft.uni-mainz.de/~ag/xplore/${P}.tar.bz2"
 HOMEPAGE="http://www.musikwissenschaft.uni-mainz.de/~ag/xplore/"
-DEPEND="virtual/x11
-		>=x11-libs/openmotif-2.1.30-r1"
 
-#RDEPEND=""
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
 
-src_compile() {
+DEPEND="virtual/x11
+	>=x11-libs/openmotif-2.1.30-r1"
 
+src_compile() {
 	#Fix Xplore.tmpl so installation is to /usr instead of /usr/X11R6
 	#Note: LIBDIR is used to point to X11 tree.
 	cp Xplore.tmpl Xplore.tmpl.orig
@@ -23,14 +25,9 @@ src_compile() {
 		
 	xmkmf -a || die "xmkmf Makefile creation failed"
 	emake || die "Parallel make failed."
-	
 }
 
 src_install () {
-	
-	# try make prefix=${D}/usr install
-
-    make DESTDIR=${D} install || die "Installation failed"
-	 dodoc COPYING ChangeLog INSTALL README TODO
+	make DESTDIR=${D} install || die "Installation failed"
+	dodoc COPYING ChangeLog INSTALL README TODO
 }
-
diff --git a/app-misc/xsnap/xsnap-1.3.ebuild b/app-misc/xsnap/xsnap-1.3.ebuild
index 73db32593475..be59982a7bd0 100644
--- a/app-misc/xsnap/xsnap-1.3.ebuild
+++ b/app-misc/xsnap/xsnap-1.3.ebuild
@@ -1,27 +1,26 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Grant Goodyear <grant@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-misc/xsnap/xsnap-1.3.ebuild,v 1.3 2002/05/15 06:56:52 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/xsnap/xsnap-1.3.ebuild,v 1.4 2002/07/25 19:18:35 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Program to interactively take a 'snapshot' of a region of 
 the screen"
 SRC_URI="ftp://ftp.ac-grenoble.fr/ge/Xutils/${P}.tgz"
-HOMEPAGE=""
+HOMEPAGE="ftp://ftp.ac-grenoble.fr/ge/Xutils/"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="x86"
 
 DEPEND="virtual/x11"
 
 src_compile() {
-
 	xmkmf || die
 	make || die
-
 }
 
 src_install () {
-
 	make DESTDIR=${D} install || die
 	make DESTDIR=${D} install.man || die
 	dodoc README INSTALL AUTHORS
-
 }
diff --git a/app-misc/xtrlock/xtrlock-2.0.ebuild b/app-misc/xtrlock/xtrlock-2.0.ebuild
index 8c9e3ca4fdf1..472867015475 100644
--- a/app-misc/xtrlock/xtrlock-2.0.ebuild
+++ b/app-misc/xtrlock/xtrlock-2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# /home/cvsroot/gentoo-x86/app-misc/xtrlock/xtrlock-2.0.ebuild,v 1.1 2001/10/06 15:30:15 ryan Exp
+# $Header: /var/cvsroot/gentoo-x86/app-misc/xtrlock/xtrlock-2.0.ebuild,v 1.4 2002/07/25 19:18:35 seemant Exp $
 
 MY_P=${PN}_${PV}-6
 S=${WORKDIR}/${P}
@@ -8,18 +8,19 @@ DESCRIPTION="A simplistic screen locking program for X"
 SRC_URI="ftp://ftp.debian.org/debian/dists/stable/main/source/x11/${MY_P}.tar.gz"
 HOMEPAGE="ftp://ftp.debian.org/debian/dists/stable/main/source/x11/"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
 DEPEND="virtual/x11"
 
 src_compile() {
-
 	xmkmf || die
 	cp Makefile Makefile.orig
 	make CFLAGS="${CFLAGS} -DSHADOW_PWD" xtrlock || die
-
 }
 
 src_install () {
-
 	dobin xtrlock
 	chmod u+s ${D}/usr/bin/xtrlock 
 	mv xtrlock.man xtrlock.1
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 dee0732f7e3d..0efd98bb4b46 100644
--- a/app-misc/zisofs-tools/zisofs-tools-1.0.3.ebuild
+++ b/app-misc/zisofs-tools/zisofs-tools-1.0.3.ebuild
@@ -1,18 +1,20 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-misc/zisofs-tools/zisofs-tools-1.0.3.ebuild,v 1.1 2002/06/06 19:21:42 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/zisofs-tools/zisofs-tools-1.0.3.ebuild,v 1.2 2002/07/25 19:18:35 seemant Exp $
 
+S=${WORKDIR}/${P}
 DESCRIPTION="User utilities for zisofs"
 HOMEPAGE="http://www.kernel.org/pub/linux/utils/fs/zisofs/"
 SRC_URI="http://www.kernel.org/pub/linux/utils/fs/zisofs/${P}.tar.bz2"
 
-S=${WORKDIR}/${P}
-DEPEND="virtual/glibc >=sys-libs/zlib-1.1.4"
-LICENSE="GPL-2"
+DEPEND=">=sys-libs/zlib-1.1.4"
+
 SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
 
 src_compile() {
-	econf --host=${CHOST} || die
+	econf || die
 	make || die
 }