repoman'd

52 files changed, 309 insertions, 725 deletions

diff --git a/dev-util/devhelp/devhelp-0.4-r1.ebuild b/dev-util/devhelp/devhelp-0.4-r1.ebuild
index 7a3e9bd6d6a4..a5934c6316d9 100644
--- a/dev-util/devhelp/devhelp-0.4-r1.ebuild
+++ b/dev-util/devhelp/devhelp-0.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-0.4-r1.ebuild,v 1.3 2002/07/23 13:28:37 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-0.4-r1.ebuild,v 1.4 2002/07/23 13:31:56 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Developer help browser"
@@ -55,5 +55,4 @@ pkg_postinst() {
 	GCONF_CONFIG_SOURCE=$SOURCE \
 		gconftool-1 --makefile-install-rule \
 		/etc/gconf/schemas/devhelp.schemas \ 
-		|| die "gconftool-1 execution failed"
 }
diff --git a/dev-util/lincvs/files/digest-lincvs-0.3.0-r1 b/dev-util/lincvs/files/digest-lincvs-0.3.0-r1
deleted file mode 100644
index 5f804aee3a3f..000000000000
--- a/dev-util/lincvs/files/digest-lincvs-0.3.0-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 f6f6875aa6ba9fe675acffbf9238d5a7 lincvs-0.3-0-generic-src.tgz 225854
-MD5 ea3c83b9ad56ca8702d8e91efae5c710 lincvs-0.3.patch-1.tgz 495
diff --git a/dev-util/lincvs/lincvs-0.3.0-r1.ebuild b/dev-util/lincvs/lincvs-0.3.0-r1.ebuild
deleted file mode 100644
index a8077b8f7ed2..000000000000
--- a/dev-util/lincvs/lincvs-0.3.0-r1.ebuild
+++ /dev/null
@@ -1,45 +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/dev-util/lincvs/lincvs-0.3.0-r1.ebuild,v 1.4 2002/07/23 05:29:48 raker Exp $
-
-S=${WORKDIR}/LinCVS-0.3
-DESCRIPTION="A Graphical CVS Client"
-SRC_URI="http://ppprs1.phy.tu-dresden.de/~trogisch/${PN}/download/${P}/${PN}-0.3-0-generic-src.tgz
-	 http://ppprs1.phy.tu-dresden.de/~trogisch/${PN}/download/${P}/${PN}-0.3.patch-1.tgz"
-HOMEPAGE="http://www.lincvs.de"
-SLOT="0"
-DEPEND="kde? ( =kde-base/kdelibs-2* ) =x11-libs/qt-2*"
-RDEPEND="$DEPEND dev-util/cvs"
-KEYWORDS="*"
-LICENSE="GPL-2"
-
-src_unpack () {
-	unpack ${A}
-	patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
-	cd ${S}/src
-	patch diffview.cpp ${WORKDIR}/LinCVS-patch/diffview.patch
-}	
-
-src_compile() {
-	if [ "`use kde`" ] ; then
-		sed "s:KDE2DIR:KDEDIR:g" Makefile.kde2 > Makefile
-	fi
-	cp Makefile Makefile.orig
-	sed -e "s:-O2:${CFLAGS}:" Makefile.orig > Makefile
-	make
-}
-
-src_install () {
-	into /usr
-	dobin LinCVS tools/*.sh
-	insinto /usr/share/icons/lincvs
-	doins res/*.xpm
-	dodoc AUTHORS COPYING ChangeLog 
-	#This is required by the app - uncmopressed txt's
-	cd ${D}/usr/share/doc
-	ln -s ${P}-${PR} ${PN}
-	cd ${PN}
-	cp ${S}/*.{txt,TXT} .
-}
-
-
diff --git a/dev-util/lincvs/lincvs-0.9.90.ebuild b/dev-util/lincvs/lincvs-0.9.90.ebuild
index 5bea6c26eee2..b6569daa3428 100644
--- a/dev-util/lincvs/lincvs-0.9.90.ebuild
+++ b/dev-util/lincvs/lincvs-0.9.90.ebuild
@@ -1,17 +1,22 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-util/lincvs/lincvs-0.9.90.ebuild,v 1.1 2002/07/23 05:29:48 raker Exp $
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/lincvs/lincvs-0.9.90.ebuild,v 1.2 2002/07/23 13:28:37 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A Graphical CVS Client"
-SRC_URI="http://ppprs1.phy.tu-dresden.de/~trogisch/lincvs/download/LINCVS/lincvs-0.9.90/lincvs-0.9.90-0-generic-src.tgz"
+SRC_URI="http://ppprs1.phy.tu-dresden.de/~trogisch/${PN}/download/LINCVS/${P}/${P}-0-generic-src.tgz"
 HOMEPAGE="http://www.lincvs.org"
+
 SLOT="0"
-DEPEND="kde? ( =kde-base/kdelibs-2* ) =x11-libs/qt-2*"
-RDEPEND="$DEPEND dev-util/cvs"
-KEYWORDS="*"
+KEYWORDS="x86"
 LICENSE="GPL-2"
 
+DEPEND="kde? ( =kde-base/kdelibs-2* )
+	=x11-libs/qt-2*"
+
+RDEPEND="${DEPEND}
+	dev-util/cvs"
+
 src_unpack() {
 
 	unpack ${A}
diff --git a/dev-util/ltrace/files/digest-ltrace-0.3.26 b/dev-util/ltrace/files/digest-ltrace-0.3.26
deleted file mode 100644
index 0e93ea866e84..000000000000
--- a/dev-util/ltrace/files/digest-ltrace-0.3.26
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e9711d5cfb904651d82e37a9973c9ee9 ltrace_0.3.26.tar.gz 101587
diff --git a/dev-util/ltrace/ltrace-0.3.26-r1.ebuild b/dev-util/ltrace/ltrace-0.3.26-r1.ebuild
index 620ee3c1c2a0..3880a0f94888 100644
--- a/dev-util/ltrace/ltrace-0.3.26-r1.ebuild
+++ b/dev-util/ltrace/ltrace-0.3.26-r1.ebuild
@@ -1,15 +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/dev-util/ltrace/ltrace-0.3.26-r1.ebuild,v 1.1 2002/06/29 02:08:25 seemant Exp $
-
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ltrace/ltrace-0.3.26-r1.ebuild,v 1.2 2002/07/23 13:28:37 seemant Exp $
 
 S=${WORKDIR}/${P}
-FILE_VERSION="ltrace_0.3.26"
 DESCRIPTION="ltrace shows runtime library call information for dynamically linked executables"
-SRC_URI="http://ftp.debian.org/debian/pool/main/l/ltrace/${FILE_VERSION}.tar.gz"
+SRC_URI="http://ftp.debian.org/debian/pool/main/l/ltrace/${PN}_${PV}.tar.gz"
 HOMEPAGE="http://packages.debian.org/unstable/utils/ltrace.html"
-SLOT=""
+
+SLOT="0"
 LICENSE="GPL-2"
+KEYWORDS="x86"
 
 DEPEND="virtual/glibc"
 
@@ -23,7 +23,6 @@ src_compile() {
 		Makefile.orig > Makefile || die "sed failed...new version of Makefile?"
 	
 	emake all || die
-
 }
 
 src_install() {
@@ -33,5 +32,4 @@ src_install() {
 	# documentation
 	rm -rvf ${D}usr/doc/
 	dodoc BUGS COPYING debian/changelog README TODO
-
 }
diff --git a/dev-util/ltrace/ltrace-0.3.26.ebuild b/dev-util/ltrace/ltrace-0.3.26.ebuild
deleted file mode 100644
index 43b22450a703..000000000000
--- a/dev-util/ltrace/ltrace-0.3.26.ebuild
+++ /dev/null
@@ -1,34 +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/dev-util/ltrace/ltrace-0.3.26.ebuild,v 1.1 2002/06/06 09:07:22 doctomoe Exp $
-
-
-S=${WORKDIR}/${P}
-FILE_VERSION="ltrace_0.3.26"
-DESCRIPTION="ltrace shows runtime library call information for dynamically linked executables"
-SRC_URI="http://ftp.debian.org/debian/pool/main/l/ltrace/${FILE_VERSION}.tar.gz"
-HOMEPAGE="http://packages.debian.org/unstable/utils/ltrace.html"
-
-DEPEND="virtual/glibc"
-
-src_compile() {
-
-  ./configure --prefix=/usr || die
-
-  # modify CFLAGS (hopefully in a more time friendly way)
-  mv Makefile Makefile.orig
-  sed "s/ -O2 / ${CFLAGS} /" Makefile.orig > Makefile || die "sed failed... newer version of Makefile?"
-  
-  emake all || die
-
-}
-
-src_install() {
-
-  make DESTDIR=${D} install || die
-
-  # documentation
-  rm -rvf ${D}usr/doc/
-  dodoc BUGS COPYING debian/changelog README TODO
-
-}
diff --git a/dev-util/memprof/memprof-0.4.1-r1.ebuild b/dev-util/memprof/memprof-0.4.1-r1.ebuild
index 23c8cf4bdcfe..48b63fa149c9 100644
--- a/dev-util/memprof/memprof-0.4.1-r1.ebuild
+++ b/dev-util/memprof/memprof-0.4.1-r1.ebuild
@@ -1,37 +1,36 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-util/memprof/memprof-0.4.1-r1.ebuild,v 1.2 2002/07/11 06:30:25 drobbins Exp $
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/memprof/memprof-0.4.1-r1.ebuild,v 1.3 2002/07/23 13:28:37 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="MemProf - Profiling and leak detection"
 SRC_URI="http://people.redhat.com/otaylor/memprof/${P}.tar.gz"
 HOMEPAGE="http://people.redhat.com/otaylor/memprof/"
 
-RDEPEND=">=gnome-base/gnome-libs-1.4.1.2-r1
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
+DEPEND=">=gnome-base/gnome-libs-1.4.1.2-r1
 	 sys-devel/binutils
 	 >=gnome-base/libglade-0.17-r1"
 
-DEPEND="${RDEPEND}
+RDEPEND="${DEPEND}
 	nls? ( sys-devel/gettext )"
 	
 src_compile() {
 	local myconf
 
-	if [ -z "`use nls`" ] ; then
-		myconf="--disable-nls"
-	fi
-
-	./configure --host=${CHOST} 					\
-		    --prefix=/usr					\
-		    --sysconfdir=/etc					\
-		    --disable-more-warnings				\
-		    $myconf || die
+	use nls || myconf="--disable-nls"
+	
+	econf \
+		--disable-more-warnings \
+		${myconf} || die
 
 	emake || die
 }
 
 src_install () {
 	make DESTDIR=${D} install || die
-
 	dodoc AUTHORS COPYING ChangeLog README NEWS TODO
 }
diff --git a/dev-util/mergetrees/mergetrees-0.9.3.ebuild b/dev-util/mergetrees/mergetrees-0.9.3.ebuild
index 2924c15c6404..54c7ae3d836d 100644
--- a/dev-util/mergetrees/mergetrees-0.9.3.ebuild
+++ b/dev-util/mergetrees/mergetrees-0.9.3.ebuild
@@ -1,31 +1,26 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mergetrees/mergetrees-0.9.3.ebuild,v 1.3 2002/07/11 06:30:25 drobbins Exp $
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mergetrees/mergetrees-0.9.3.ebuild,v 1.4 2002/07/23 13:28:37 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A three-way directory merge tool"
 SRC_URI="http://cvs.bofh.asn.au/mergetrees/${P}.tar.gz"
 HOMEPAGE="http://cvs.bofh.asn.au/mergetrees/"
 
-RDEPEND="virtual/glibc
-	>=sys-devel/perl-5
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
+DEPEND=">=sys-devel/perl-5
 	>=sys-apps/diffutils-2"
 
 src_compile() {                           
-	./configure --prefix=/usr					\
-		    --mandir=/usr/share/man				\
-		    --infodir=/usr/share/info
-	assert
-
+	econf || die
 	make clean || die
 	emake || die
 }
 
 src_install() {                               
-	make prefix=${D}/usr						\
-	     mandir=${D}/usr/share/man					\
-	     infodir=${D}/usr/share/info				\
-	     install || die
-	
+	einstall || die
 	dodoc AUTHORS COPYING Changelog NEWS README* TODO
 }
diff --git a/dev-util/netbeans/files/digest-netbeans-3.3.1 b/dev-util/netbeans/files/digest-netbeans-3.3.1
deleted file mode 100644
index 2ed8e868d354..000000000000
--- a/dev-util/netbeans/files/digest-netbeans-3.3.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 83561da59ec821e75b70b53016d036c3 NetBeansIDE-release331.tar.gz 16097848
diff --git a/dev-util/netbeans/netbeans-3.3.1.ebuild b/dev-util/netbeans/netbeans-3.3.1.ebuild
deleted file mode 100644
index 425422bc33f8..000000000000
--- a/dev-util/netbeans/netbeans-3.3.1.ebuild
+++ /dev/null
@@ -1,59 +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/dev-util/netbeans/netbeans-3.3.1.ebuild,v 1.3 2002/07/11 06:30:25 drobbins Exp $
-
-MY_P=NetBeansIDE-release331
-S=${WORKDIR}/${PN}
-DESCRIPTION="Netbeans ${PV} IDE for Java"
-SRC_URI="http://www.netbeans.org/download/release33/night/build200202011224/${MY_P}.tar.gz"
-HOMEPAGE="http://www.netbeans.org"
-
-RDEPEND=">=virtual/jdk-1.3"
-
-src_unpack() {
-	unpack ${A}
-
-	# fix jdkhome references
-	cd ${S}/bin
-	# rmid_wrapper.sh
-	cp rmid_wrapper.sh rmid_wrapper.sh.orig
-	sed -e 's:^jdkhome="":jdkhome="`java-config --jdk-home`":' \
-		rmid_wrapper.sh.orig >rmid_wrapper.sh
-	rm -f rmid_wrapper.sh.orig
-	# runide.sh
-	cp runide.sh runide.sh.orig
-	sed -e 's:^jdkhome="":jdkhome="`java-config --jdk-home`":' \
-		runide.sh.orig >runide.sh
-	rm -f runide.sh.orig
-
-}
-
-src_install() {
-	# remove non-x86 Linux binaries
-	rm -f ${S}/bin/runide*.exe ${S}/bin/rmid_wrapper.exe
-	rm -f ${S}/bin/runide*.com
-	rm -f ${S}/bin/runideos2.cmd
-	rm -f ${S}/bin/fastjavac/fastjavac.exe
-	rm -f ${S}/bin/fastjavac/fastjavac.sun
-	rm -f ${S}/bin/fastjavac/fastjavac.sun.intel
-	rm -f ${S}/bin/unsupported/*.bat
-	dodir /opt/${P}
-	dodoc build_info 
-	dohtml CHANGES.html CREDITS.html README.html netbeans.css
-	# note: docs/ are docs used internally by the IDE
-	cp -Rdp beans bin docs lib modules sources system ${D}/opt/${P}
-
-	# This is a binary-only package. It will only live in /opt -- karltk
-	# dodir /usr/bin
-	# dosym /opt/${P}/bin/runide.sh /usr/bin/netbeans
-	# dosym /opt/${P}/bin/rmid_wrapper.sh /usr/bin/rmid_wrapper
-	# dosym /opt/${P}/bin/unsupported/nbscript.sh /usr/bin/nbscript
-
-	# install icon and desktop entry for gnome
-	if [ "`use gnome`" ] ; then
-		insinto /usr/share/pixmaps
-		doins ${FILESDIR}/netbeans.png
-		insinto /usr/share/gnome/apps/Development
-		doins ${FILESDIR}/netbeans.desktop
-	fi
-}
diff --git a/dev-util/netbeans/netbeans-3.3.2.ebuild b/dev-util/netbeans/netbeans-3.3.2.ebuild
index 3e9a5299fca2..b45be192bcc3 100644
--- a/dev-util/netbeans/netbeans-3.3.2.ebuild
+++ b/dev-util/netbeans/netbeans-3.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-3.3.2.ebuild,v 1.1 2002/06/29 06:08:55 george Exp $
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-3.3.2.ebuild,v 1.2 2002/07/23 13:28:37 seemant Exp $
 
 MY_P=NetBeansIDE-release332
 S=${WORKDIR}/${PN}
@@ -10,6 +10,7 @@ HOMEPAGE="http://www.netbeans.org"
 
 SLOT="0"
 LICENSE="GPL-2 Apache-1.1 sun-j2ee"
+KEYWORDS="x86"
 #still need to add JPython, Sun Public and DynamicJava licenses
 #sun-j2ee actually contains Sun Binary Code license
 #will have to be renamed and containing it ebuilds updated at spome point..
diff --git a/dev-util/pccts/pccts-1.33.32-r1.ebuild b/dev-util/pccts/pccts-1.33.32-r1.ebuild
index 93f3f9962c3a..32ceebc0033e 100644
--- a/dev-util/pccts/pccts-1.33.32-r1.ebuild
+++ b/dev-util/pccts/pccts-1.33.32-r1.ebuild
@@ -1,14 +1,17 @@
 # Copyright 2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pccts/pccts-1.33.32-r1.ebuild,v 1.2 2002/07/11 06:30:25 drobbins Exp $
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pccts/pccts-1.33.32-r1.ebuild,v 1.3 2002/07/23 13:28:37 seemant Exp $
 
-S=${WORKDIR}/pccts
-DESCRIPTION="An embedded C/C++ parser generator"
+S=${WORKDIR}/${PN}
+DESCRIPTION="Purdue Compiler Construction Tool Set is an embedded C/C++ parser generator"
 SRC_URI="http://www.polhode.com/pccts133mr32.zip"
 HOMEPAGE="http://www.polhode.com/"
 
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="x86"
+
 DEPEND="app-arch/unzip"
-RDEPEND=""
 
 src_unpack() {
 	unpack ${A}
diff --git a/dev-util/pharmacy/pharmacy-0.3-r1.ebuild b/dev-util/pharmacy/pharmacy-0.3-r1.ebuild
index 7235c1649e11..6c1ce064b8ea 100644
--- a/dev-util/pharmacy/pharmacy-0.3-r1.ebuild
+++ b/dev-util/pharmacy/pharmacy-0.3-r1.ebuild
@@ -1,24 +1,27 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pharmacy/pharmacy-0.3-r1.ebuild,v 1.5 2002/07/11 06:30:25 drobbins Exp $
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pharmacy/pharmacy-0.3-r1.ebuild,v 1.6 2002/07/23 13:28:37 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Gnome Front-End to CVS"
 SRC_URI="mirror://sourceforge/pharmacy/${P}.tar.gz"
 HOMEPAGE="http://pharmacy.sourceforge.net"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
 DEPEND=">=gnome-base/gnome-libs-1.4.1.2-r1"
 
 src_compile() {
-	./configure --prefix=/usr --host=${CHOST} || die
-
+	econf || die
 	make || die
 }
 
 src_install () {
 	make DESTDIR=${D} install || die
 
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
+	dodoc AUTHORS COPYING ChangeLog NEWS README TODO
 
 	insinto /usr/share/doc/pharmacy/index
 	doins docs/index/* 
diff --git a/dev-util/pkgconfig/files/digest-pkgconfig-0.8.0 b/dev-util/pkgconfig/files/digest-pkgconfig-0.8.0
deleted file mode 100644
index 63ee5cd87dac..000000000000
--- a/dev-util/pkgconfig/files/digest-pkgconfig-0.8.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e110ee9635fbc0ec159c440c75876a96 pkgconfig-0.8.0.tar.gz 585852
diff --git a/dev-util/pkgconfig/pkgconfig-0.8.0.ebuild b/dev-util/pkgconfig/pkgconfig-0.8.0.ebuild
deleted file mode 100644
index b0c8acff1563..000000000000
--- a/dev-util/pkgconfig/pkgconfig-0.8.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.8.0.ebuild,v 1.4 2002/07/23 12:24:26 chadh Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Package Config system that manages compile/link flags for libraries"
-SRC_URI="http://www.freedesktop.org/software/pkgconfig/releases/${P}.tar.gz"
-HOMEPAGE="http://www.freedesktop.org/software/pkgconfig/"
-SLOT="0"
-KEYWORDS="x86"
-LICENSE="GPL-2"
-
-DEPEND="virtual/glibc"
-RDEPEND=""
-
-src_compile() {
-	./configure --host=${CHOST}					\
-		    --prefix=/usr					\
-		    --mandir=/usr/share/man
-	assert
-
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING ChangeLog NEWS README 
-}
diff --git a/dev-util/poedit/files/digest-poedit-1.1.5 b/dev-util/poedit/files/digest-poedit-1.1.5
deleted file mode 100644
index 26a8e1e0db20..000000000000
--- a/dev-util/poedit/files/digest-poedit-1.1.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 25fa4aaf2ce17702993a63266edb94ae poedit-1.1.5.tar.bz2 333152
diff --git a/dev-util/poedit/poedit-1.1.5.ebuild b/dev-util/poedit/poedit-1.1.5.ebuild
deleted file mode 100644
index 796b33fa15db..000000000000
--- a/dev-util/poedit/poedit-1.1.5.ebuild
+++ /dev/null
@@ -1,46 +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/dev-util/poedit/poedit-1.1.5.ebuild,v 1.4 2002/07/11 06:30:25 drobbins Exp $
-
-S=${WORKDIR}/${P}
-
-DESCRIPTION="Cross-platform gettext catalogs (.po files) editor."
-
-SRC_URI="mirror://sourceforge/poedit/${P}.tar.bz2"
-
-HOMEPAGE="http://poedit.sourceforge.net/"
-
-DEPEND=">=x11-libs/wxGTK-2.3.2
-	>=sys-libs/db-3"
-
-src_unpack() {
-
-    unpack ${A}
-    cd ${S}
-    patch -p0 <${FILESDIR}/${P}-gentoo.diff
-
-}
-
-src_compile() {
- 
-	./configure --host=${CHOST} \
-			--prefix=/usr \
-			--mandir=/usr/share/man \
-			--infodir=/usr/share/info \
-			--datadir=/usr/share
-	assert
-
-	emake || die
-}
-
-src_install () {
-	
-	make prefix=${D}/usr DESTDIR=${D} \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		datadir=${D}/usr/share \
-		GNOME_DATA_DIR=${D}/usr/share \
-		install || die
-
-	dodoc AUTHORS LICENSE NEWS README TODO
-}
diff --git a/dev-util/poedit/poedit-1.1.8.ebuild b/dev-util/poedit/poedit-1.1.8.ebuild
index e7499cb79a80..ff1fac6ca29f 100644
--- a/dev-util/poedit/poedit-1.1.8.ebuild
+++ b/dev-util/poedit/poedit-1.1.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-util/poedit/poedit-1.1.8.ebuild,v 1.1 2002/07/10 20:36:33 seemant Exp $
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/poedit/poedit-1.1.8.ebuild,v 1.2 2002/07/23 13:28:37 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Cross-platform gettext catalogs (.po files) editor."
@@ -32,12 +32,10 @@ src_compile() {
 
 src_install () {
 	
-	make prefix=${D}/usr DESTDIR=${D} \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
+	einstall \
+		DESTDIR=${D} \
 		datadir=${D}/usr/share \
-		GNOME_DATA_DIR=${D}/usr/share \
-		install || die
+		GNOME_DATA_DIR=${D}/usr/share || die
 
 	dodoc AUTHORS LICENSE NEWS README TODO
 }
diff --git a/dev-util/qtunit/files/digest-qtunit-0.9.6 b/dev-util/qtunit/files/digest-qtunit-0.9.6
deleted file mode 100644
index 64e673283ad4..000000000000
--- a/dev-util/qtunit/files/digest-qtunit-0.9.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dbc4a94e54e2b22575819be29b4d8065 qtunit-0.9.6.tar.bz2 83978
diff --git a/dev-util/qtunit/qtunit-0.9.6.ebuild b/dev-util/qtunit/qtunit-0.9.6.ebuild
deleted file mode 100644
index e39d3bcee48d..000000000000
--- a/dev-util/qtunit/qtunit-0.9.6.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/dev-util/qtunit/qtunit-0.9.6.ebuild,v 1.3 2002/07/11 06:30:25 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="QtUnit is a unit testing framework for c++"
-SRC_URI="mirror://sourceforge/qtunit/${PN}-${PV}.tar.bz2"
-HOMEPAGE="http://www.theleaf.be/projects/qtunit"
-
-DEPEND="=x11-libs/qt-3*"
-	
-export QTDIR="/usr/qt/3"
-export PATH="$QTDIR/bin:$PATH"
-export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH"
-export QMAKESPEC="linux-g++"
-
-src_compile() {
-
-	qmake qtunit.pro || die
-	make || die	# emake doesn't work
-
-}
-
-src_install () {
-
-	insinto /usr
-	dolib lib/libqtunit.so.1.0.0
-	dosym /usr/lib/libqtunit.so.1.0.0 /usr/lib/libqtunit.so.1.0
-	dosym /usr/lib/libqtunit.so.1.0 /usr/lib/libqtunit.so.1
-	dosym /usr/lib/libqtunit.so.1 /usr/lib/libqtunit.so
-	dobin bin/guitestrunner
-	dobin bin/texttestrunner
-	
-	dodir /usr/include/qtunit
-	find src -name "*.h" -exec cp '{}' ${D}/usr/include/qtunit ';'
-	
-	docinto /usr
-	dodoc ChangeLog
-	dodoc INSTALL
-	dodoc COPYING
-
-	dodir /usr/share/doc/${P}
-	cp -a html ${D}/usr/share/doc/${P}
-	
-	dodir /usr/share/doc/${P}/plugins
-	cp -a plugins/libexampletestmodule.so ${D}/usr/share/doc/${P}/plugins
-
-	dodir /usr/share/doc/${P}/samples/standalonerunner
-	dodir /usr/share/doc/${P}/samples/testmodule
-	dodir /usr/share/doc/${P}/samples/guitestrunner
-	dodir /usr/share/doc/${P}/samples/texttestrunner
-	
-	cp -a samples/standalonerunner/*.cpp ${D}/usr/share/doc/${P}/samples/standalonerunner
-	cp -a samples/standalonerunner/*.h ${D}/usr/share/doc/${P}/samples/standalonerunner
-	cp -a samples/standalonerunner/*.pro ${D}/usr/share/doc/${P}/samples/standalonerunner
-	cp -a samples/testmodule/*.cpp ${D}/usr/share/doc/${P}/samples/testmodule
-	cp -a samples/testmodule/*.h ${D}/usr/share/doc/${P}/samples/testmodule
-	cp -a samples/testmodule/*.pro ${D}/usr/share/doc/${P}/samples/testmodule
-	cp -a samples/guitestrunner/*.cpp ${D}/usr/share/doc/${P}/samples/guitestrunner
-	cp -a samples/guitestrunner/*.pro ${D}/usr/share/doc/${P}/samples/guitestrunner
-	cp -a samples/texttestrunner/*.cpp ${D}/usr/share/doc/${P}/samples/texttestrunner
-	cp -a samples/texttestrunner/*.pro ${D}/usr/share/doc/${P}/samples/texttestrunner
-	
-	sed -e "s#<FILEPATH>#<FILEPATH>/usr/share/doc/${P}/#" \
-		-e "s#<SOURCEPATH>#<SOURCEPATH>/usr/share/doc/${P}/#" \
-		testproject.qpj > ${D}/usr/share/doc/${P}/testproject.qpj
-
-}
-
diff --git a/dev-util/qtunit/qtunit-0.9.7.ebuild b/dev-util/qtunit/qtunit-0.9.7.ebuild
index 8e2e105b1644..4adc300638c8 100644
--- a/dev-util/qtunit/qtunit-0.9.7.ebuild
+++ b/dev-util/qtunit/qtunit-0.9.7.ebuild
@@ -1,12 +1,16 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
+# Distributed under the terms of the GNU General Public License, v2
 # /space/gentoo/cvsroot/gentoo-x86/dev-util/qtunit/qtunit-0.9.6.ebuild,v 1.2 2002/05/27 17:27:38 drobbins Exp
 
 S=${WORKDIR}/${P}
 DESCRIPTION="QtUnit is a unit testing framework for c++"
-SRC_URI="http://freesoftware.fsf.org/download/qtunit/${PN}-${PV}.tar.bz2"
+SRC_URI="http://freesoftware.fsf.org/download/qtunit/${P}.tar.bz2"
 HOMEPAGE="http://www.theleaf.be/projects/qtunit"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
 DEPEND="=x11-libs/qt-3*"
 	
 export QTDIR="/usr/qt/3"
@@ -34,36 +38,37 @@ src_install () {
 	dodir /usr/include/qtunit
 	find src -name "*.h" -exec cp '{}' ${D}/usr/include/qtunit ';'
 	
-	docinto /usr
 	dodoc ChangeLog
 	dodoc INSTALL
 	dodoc COPYING
 
-	dodir /usr/share/doc/${P}
-	cp -a html ${D}/usr/share/doc/${P}
+	dohtml -r html
 	
-	dodir /usr/share/doc/${P}/plugins
-	cp -a plugins/libexampletestmodule.so ${D}/usr/share/doc/${P}/plugins
+	docinto plugins
+	dodoc plugins/libexampletestmodule.so
 
-	dodir /usr/share/doc/${P}/samples/standalonerunner
-	dodir /usr/share/doc/${P}/samples/testmodule
-	dodir /usr/share/doc/${P}/samples/guitestrunner
-	dodir /usr/share/doc/${P}/samples/texttestrunner
-	
-	cp -a samples/standalonerunner/*.cpp ${D}/usr/share/doc/${P}/samples/standalonerunner
-	cp -a samples/standalonerunner/*.h ${D}/usr/share/doc/${P}/samples/standalonerunner
-	cp -a samples/standalonerunner/*.pro ${D}/usr/share/doc/${P}/samples/standalonerunner
-	cp -a samples/testmodule/*.cpp ${D}/usr/share/doc/${P}/samples/testmodule
-	cp -a samples/testmodule/*.h ${D}/usr/share/doc/${P}/samples/testmodule
-	cp -a samples/testmodule/*.pro ${D}/usr/share/doc/${P}/samples/testmodule
-	cp -a samples/guitestrunner/*.cpp ${D}/usr/share/doc/${P}/samples/guitestrunner
-	cp -a samples/guitestrunner/*.pro ${D}/usr/share/doc/${P}/samples/guitestrunner
-	cp -a samples/texttestrunner/*.cpp ${D}/usr/share/doc/${P}/samples/texttestrunner
-	cp -a samples/texttestrunner/*.pro ${D}/usr/share/doc/${P}/samples/texttestrunner
+
+	docinto samples/standalonerunner
+	dodoc samples/standalonerunner/*.cpp
+	dodoc samples/standalonerunner/*.h
+	dodoc samples/standalonerunner/*.pro
+
+	docinto samples/testmodule
+	dodoc samples/testmodule/*.cpp
+	dodoc samples/testmodule/*.h
+	dodoc  samples/testmodule/*.pro
+
+	docinto samples/guitestrunner
+	dodoc samples/guitestrunner/*.cpp
+	dodoc samples/guitestrunner/*.pro
+
+	docinto samples/texttestrunner
+	dodoc samples/texttestrunner/*.cpp
+	dodoc samples/texttestrunner/*.pro
 	
-	sed -e "s#<FILEPATH>#<FILEPATH>/usr/share/doc/${P}/#" \
-		-e "s#<SOURCEPATH>#<SOURCEPATH>/usr/share/doc/${P}/#" \
-		testproject.qpj > ${D}/usr/share/doc/${P}/testproject.qpj
+	sed -e "s#<FILEPATH>#<FILEPATH>/usr/share/doc/${PF}/#" \
+		-e "s#<SOURCEPATH>#<SOURCEPATH>/usr/share/doc/${PF}/#" \
+		testproject.qpj > ${D}/usr/share/doc/${PF}/testproject.qpj
 
 }
 
diff --git a/dev-util/rhide/rhide-1.4.9-r1.ebuild b/dev-util/rhide/rhide-1.4.9-r1.ebuild
index 75af8450602e..401df0283315 100644
--- a/dev-util/rhide/rhide-1.4.9-r1.ebuild
+++ b/dev-util/rhide/rhide-1.4.9-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-util/rhide/rhide-1.4.9-r1.ebuild,v 1.3 2002/07/11 06:30:25 drobbins Exp $
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rhide/rhide-1.4.9-r1.ebuild,v 1.4 2002/07/23 13:28:37 seemant Exp $
 
 TVISIONVER="1.1.3b"
 SETEDITVER="0.4.41"
@@ -9,15 +9,18 @@ GDBVER="5.0"
 
 S=${WORKDIR}/${P}
 DESCRIPTION="RHIDE is a console IDE for various languages."
-SRC_URI="http://download.sourceforge.net/rhide/rhide-${PV}.tar.gz
+SRC_URI="http://download.sourceforge.net/rhide/${P}.tar.gz
 	 http://download.sourceforge.net/setedit/rhtvision-${TVISIONVER}.src.tar.gz
 	 http://download.sourceforge.net/setedit/setedit-${SETEDITVER}.tar.gz
 	 ftp://ftp.gnu.org/gnu/gdb/gdb-${GDBVER}.tar.gz"
 HOMEPAGE="http://www.rhide.com/"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
 # Ugly I know, but the build fails if teTeX not installed
-DEPEND="virtual/glibc
-	dev-libs/libpcre
+DEPEND="dev-libs/libpcre
 	sys-apps/texinfo
 	sys-devel/gettext
 	sys-libs/gpm
@@ -50,9 +53,9 @@ src_compile() {
 
 	DUMMYFLAGS=""
 
-	./configure --prefix=/usr				\
-		--fhs						\
-		--cflags='${DUMMYFLAGS}'			\
+	./configure --prefix=/usr \
+		--fhs \
+		--cflags='${DUMMYFLAGS}' \
 		--cxxflags='${DUMMYFLAGS}' || die
 	
 	# Only build the static libs
@@ -71,15 +74,15 @@ src_compile() {
 
 	cd ${WORKDIR}/setedit/
 
-	./configure --prefix=/usr				\
-		--fhs						\
+	./configure --prefix=/usr \
+		--fhs \
 		--libset || die
 
 	# Fix CFLAGS and CXXFLAGS
 	cd ${WORKDIR}/setedit/makes
 	cp rhide.env rhide.env.orig
-	sed -e "s:${CFLAGS}::g"					\
-		-e "s:${CXXFLAGS}::g" 				\
+	sed -e "s:${CFLAGS}::g" \
+		-e "s:${CXXFLAGS}::g" \
 		rhide.env.orig >rhide.env
 	make clean || die
 	make force-patch || die
@@ -114,18 +117,18 @@ src_compile() {
 	export TVOBJ="${RHIDESRC}/../tvision/linux"
 
 	# -j breaks build
-	make prefix=/usr			  		\
-		install_docdir=share/doc/${PF}			\
-		install_infodir=share/info			\
+	make prefix=/usr \
+		install_docdir=share/doc/${PF} \
+		install_infodir=share/info \
 		|| die
 
 	# Update and Fix DIR entry in .info files
 	cd ${S}/share/setedit/
-	sed -e 's:editor.inf:setedit.inf:g'			\
-		${WORKDIR}/setedit/doc/editor.inf >		\
+	sed -e 's:editor.inf:setedit.inf:g' \
+		${WORKDIR}/setedit/doc/editor.inf > \
 		setedit.inf || die
-	sed -e	's:infeng.inf:infview.inf:g'			\
-		${WORKDIR}/setedit/doc/infeng.inf >             \
+	sed -e	's:infeng.inf:infview.inf:g' \
+		${WORKDIR}/setedit/doc/infeng.inf > \
 		infview.inf || die
 	cd ${S}
 
@@ -135,10 +138,10 @@ src_compile() {
 
 src_install() {
 
-	make prefix=${D}/usr					\
-	install_docdir=share/doc/${PF}				\
-	install_infodir=share/info				\
-	install || die
+	make prefix=${D}/usr \
+		install_docdir=share/doc/${PF} \
+		install_infodir=share/info \
+		install || die
 
 	# Fix .info files
 	for file in ${D}/usr/share/info/*.inf ; do
@@ -149,7 +152,7 @@ src_install() {
 
 	# Install default CFG file and fix the paths
 	cd ${D}/usr/share/rhide
-	sed -e 's:/usr/local/share:/usr/share:g'		\
+	sed -e 's:/usr/local/share:/usr/share:g' \
 		rhide_.env >rhide.env
 	echo 'INFOPATH=/usr/share/info' >> rhide.env
 
@@ -157,4 +160,3 @@ src_install() {
 	insinto /etc/env.d
 	doins ${FILESDIR}/80rhide
 }
-
diff --git a/dev-util/sashxb/files/digest-sashxb-1.0.1 b/dev-util/sashxb/files/digest-sashxb-1.0.1
deleted file mode 100644
index 5ce921c117d7..000000000000
--- a/dev-util/sashxb/files/digest-sashxb-1.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f37871c2f439c3142c243911e9a5539e SashXB-1.0.1.tar.gz 441323
diff --git a/dev-util/sashxb/sashxb-1.0.1.ebuild b/dev-util/sashxb/sashxb-1.0.1.ebuild
deleted file mode 100644
index 57f8a6788995..000000000000
--- a/dev-util/sashxb/sashxb-1.0.1.ebuild
+++ /dev/null
@@ -1,61 +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/dev-util/sashxb/sashxb-1.0.1.ebuild,v 1.2 2002/07/15 01:39:06 blizzy Exp $
-
-S="${WORKDIR}/SashXB-${PV}"
-
-DESCRIPTION="Application environment for HTML and JS developers."
-HOMEPAGE="http://oss.software.ibm.com/developerworks/opensource/sashxb/"
-SRC_URI="http://oss.software.ibm.com/developerworks/opensource/sashxb/download/runtime/SashXB-${PV}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86"
-
-RDEPEND=">=virtual/glibc-2.2.3
-	>=net-www/mozilla-1.0
-	>=dev-libs/gdome2-0.7
-	dev-libs/libxml2
-	sys-devel/gettext
-	gnome-base/libglade
-	gnome-base/ORBit
-	sys-apps/e2fsprogs
-	media-libs/gdk-pixbuf
-	gnome-base/gnome-core"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	cd ${WORKDIR}
-
-	patch -p0 -i ${FILESDIR}/${P}-mozilla.patch
-
-	cd ${S}
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--with-mozilla-lib=/usr/lib/mozilla \
-		--with-mozilla-include=/usr/include/mozilla \
-		--with-mozilla-idl=/usr/lib/mozilla/include/idl \
-		|| die "configure problem"
-
-	emake || die "compile problem"
-}
-
-src_install () {
-	make DESTDIR=${D} install || die "install problem"
-
-	dodoc ABOUT-NLS COPYING README TODO
-}
-
-pkg_postinst() {
-	einfo "The SashXB runtime has been installed. You may want to take a"
-	einfo "look at the Weblications gallery now, and install some of them"
-	einfo "from your regular user account (that means, *not* as root"
-	einfo "unless you know what you're doing):"
-	einfo ""
-	einfo "\thttp://oss.software.ibm.com/developerworks/opensource/sashxb/download/gallery.html"
-	einfo ""
-	einfo "For example, to install the Registry Test, type:"
-	einfo
-	einfo "\tsash-install regtest"
-}
-
diff --git a/dev-util/sashxb/sashxb-1.0.2.ebuild b/dev-util/sashxb/sashxb-1.0.2.ebuild
index e2b29f4611f6..1cd43d2386ce 100644
--- a/dev-util/sashxb/sashxb-1.0.2.ebuild
+++ b/dev-util/sashxb/sashxb-1.0.2.ebuild
@@ -1,35 +1,34 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-util/sashxb/sashxb-1.0.2.ebuild,v 1.1 2002/07/15 01:54:32 blizzy Exp $
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/sashxb/sashxb-1.0.2.ebuild,v 1.2 2002/07/23 13:28:37 seemant Exp $
 
 S="${WORKDIR}/${P}"
 
 DESCRIPTION="Application environment for HTML and JS developers."
 HOMEPAGE="http://oss.software.ibm.com/developerworks/opensource/sashxb/"
 SRC_URI="http://oss.software.ibm.com/developerworks/opensource/sashxb/download/runtime/${P}.tar.gz"
-LICENSE="LGPL-2.1"
+
 SLOT="0"
+LICENSE="LGPL-2.1"
 KEYWORDS="x86"
 
-RDEPEND=">=virtual/glibc-2.2.3
-	>=net-www/mozilla-1.0
+RDEPEND=">=net-www/mozilla-1.0
 	>=dev-libs/gdome2-0.7
 	dev-libs/libxml2
-	sys-devel/gettext
 	gnome-base/libglade
 	gnome-base/ORBit
 	sys-apps/e2fsprogs
 	media-libs/gdk-pixbuf
 	gnome-base/gnome-core
 	gnome-base/gnome-libs"
-DEPEND="${RDEPEND}"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
 
 src_compile() {
 	patch -p1 -i ${FILESDIR}/${P}-mozilla.patch
 
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
+	econf \
 		--with-mozilla-lib=/usr/lib/mozilla \
 		--with-mozilla-include=/usr/include/mozilla \
 		--with-mozilla-idl=/usr/lib/mozilla/include/idl \
@@ -41,7 +40,7 @@ src_compile() {
 src_install () {
 	make DESTDIR=${D} install || die "install problem"
 
-	dodoc ABOUT-NLS COPYING README TODO
+	dodoc COPYING README TODO
 }
 
 pkg_postinst() {
diff --git a/dev-util/scons/files/digest-scons-0.0.2 b/dev-util/scons/files/digest-scons-0.0.2
deleted file mode 100644
index a5b5d1e08a8d..000000000000
--- a/dev-util/scons/files/digest-scons-0.0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e4baaf3af83507b18659ad15574cba9c scons-0.02.tar.gz 47786
diff --git a/dev-util/scons/files/digest-scons-0.0.3 b/dev-util/scons/files/digest-scons-0.0.3
deleted file mode 100644
index 9f0d523f4920..000000000000
--- a/dev-util/scons/files/digest-scons-0.0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8dd34be50dce6b3b07011e8c918b6185 scons-0.03.tar.gz 54850
diff --git a/dev-util/scons/scons-0.0.2.ebuild b/dev-util/scons/scons-0.0.2.ebuild
deleted file mode 100644
index ca64cf955645..000000000000
--- a/dev-util/scons/scons-0.0.2.ebuild
+++ /dev/null
@@ -1,21 +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/dev-util/scons/scons-0.0.2.ebuild,v 1.3 2002/07/11 06:30:25 drobbins Exp $
-
-S=${WORKDIR}/scons-0.02
-DESCRIPTION="Extensible python-based build utility"
-SRC_URI="mirror://sourceforge/scons/scons-0.02.tar.gz"
-HOMEPAGE="http://www.scons.org"
-
-DEPEND=">=dev-lang/python-2.0"
-RDEPEND=">=dev-lang/python-2.0"
-
-src_compile() {
-	python setup.py build
-}
-
-src_install () {
-	python setup.py install --root=${D}
-	dodoc {CHANGES,LICENSE,README,RELEASE}.txt PKG-INFO MANIFEST
-	doman scons.1
-}
diff --git a/dev-util/scons/scons-0.0.3.ebuild b/dev-util/scons/scons-0.0.3.ebuild
deleted file mode 100644
index aeffee9257d6..000000000000
--- a/dev-util/scons/scons-0.0.3.ebuild
+++ /dev/null
@@ -1,21 +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/dev-util/scons/scons-0.0.3.ebuild,v 1.3 2002/07/11 06:30:25 drobbins Exp $
-
-S=${WORKDIR}/scons-0.03
-DESCRIPTION="Extensible python-based build utility"
-SRC_URI="mirror://sourceforge/scons/scons-0.03.tar.gz"
-HOMEPAGE="http://www.scons.org"
-
-DEPEND=">=dev-lang/python-2.0"
-RDEPEND=">=dev-lang/python-2.0"
-
-src_compile() {
-	python setup.py build
-}
-
-src_install () {
-	python setup.py install --root=${D}
-	dodoc {CHANGES,LICENSE,README,RELEASE}.txt PKG-INFO MANIFEST
-	doman scons.1
-}
diff --git a/dev-util/scons/scons-0.0.7.ebuild b/dev-util/scons/scons-0.0.7.ebuild
index 8ae1d3d53116..722281285dc6 100644
--- a/dev-util/scons/scons-0.0.7.ebuild
+++ b/dev-util/scons/scons-0.0.7.ebuild
@@ -1,16 +1,18 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/scons-0.0.7.ebuild,v 1.2 2002/07/11 06:30:25 drobbins Exp $
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/scons-0.0.7.ebuild,v 1.3 2002/07/23 13:28:37 seemant Exp $
 
-S=${WORKDIR}/scons-0.07
+MY_P=${PN}-0.07
+S=${WORKDIR}/${MY_P}
 DESCRIPTION="Extensible python-based build utility"
-SRC_URI="http://unc.dl.sourceforge.net/sourceforge/scons/scons-0.07.tar.gz
-    http://telia.dl.sourceforge.net/sourceforge/scons/scons-0.07.tar.gz"
-	
+SRC_URI="mirror://sourceforge/scons/${MY_P}.tar.gz"
 HOMEPAGE="http://www.scons.org"
 
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="x86"
+
 DEPEND=">=dev-lang/python-2.0"
-RDEPEND=">=dev-lang/python-2.0"
 
 src_compile() {
 	python setup.py build
@@ -18,6 +20,6 @@ src_compile() {
 
 src_install () {
 	python setup.py install --root=${D}
-	dodoc {CHANGES,LICENSE,README,RELEASE}.txt PKG-INFO MANIFEST
+	dodoc *.txt PKG-INFO MANIFEST
 	doman scons.1
 }
diff --git a/dev-util/sel/sel-0.08.2.ebuild b/dev-util/sel/sel-0.08.2.ebuild
index 3faade3a429d..8bb918c2e1c0 100644
--- a/dev-util/sel/sel-0.08.2.ebuild
+++ b/dev-util/sel/sel-0.08.2.ebuild
@@ -1,14 +1,17 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-util/sel/sel-0.08.2.ebuild,v 1.5 2002/07/11 06:30:25 drobbins Exp $
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/sel/sel-0.08.2.ebuild,v 1.6 2002/07/23 13:28:37 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A filemanager for shell scripts"
 SRC_URI="http://www.rhein-neckar.de/~darkstar/files/${P}.tar.gz"
 HOMEPAGE="http://www.rhein-neckar.de/~darkstar/sel.html"
 
-DEPEND="virtual/glibc
-	>=sys-libs/ncurses-5.1"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
+DEPEND=">=sys-libs/ncurses-5.1"
 
 src_unpack () {
 	unpack ${A}
diff --git a/dev-util/shtool/shtool-1.5.1-r2.ebuild b/dev-util/shtool/shtool-1.5.1-r2.ebuild
index 1bd1e83d3a0f..255c0a43568f 100644
--- a/dev-util/shtool/shtool-1.5.1-r2.ebuild
+++ b/dev-util/shtool/shtool-1.5.1-r2.ebuild
@@ -1,28 +1,24 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-util/shtool/shtool-1.5.1-r2.ebuild,v 1.3 2002/07/11 06:30:25 drobbins Exp $
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/shtool/shtool-1.5.1-r2.ebuild,v 1.4 2002/07/23 13:28:37 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A compilation of small but very stable and portable shell scripts into a single shell tool"
 SRC_URI="ftp://ftp.gnu.org/gnu/shtool/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/shtool/shtool.html"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
 DEPEND=">=sys-devel/perl-5.6"
 
 src_compile() {
-	./configure --host=${CHOST}					\
-		    --prefix=/usr					\
-		    --mandir=/usr/share/man
-	assert
-
+	econf || die
 	emake || die
 }
 
 src_install () {
-	make prefix=${D}/usr						\
-	     mandir=${D}/usr/share/man					\
-	     install || die
-
+	einstall || die
 	dodoc AUTHORS ChangeLog COPYING README THANKS VERSION
 }
-
diff --git a/dev-util/snavigator/snavigator-5.0.ebuild b/dev-util/snavigator/snavigator-5.0.ebuild
index 842c35053e2d..762c7a70eb79 100644
--- a/dev-util/snavigator/snavigator-5.0.ebuild
+++ b/dev-util/snavigator/snavigator-5.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
-# $ Header: $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/snavigator/snavigator-5.0.ebuild,v 1.3 2002/07/23 13:28:37 seemant Exp $
 
 S=${WORKDIR}/build
 
@@ -8,6 +8,10 @@ DESCRIPTION="Source-Navigator is a source code analysis tool"
 SRC_URI="http://mirrors.rcn.com/pub/sourceware/sourcenav/releases/SN50-010322-source.tar.gz"
 HOMEPAGE="http://sources.redhat.com/sourcenav/"
 
+SLOT="0"
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS="x86"
+
 DEPEND=">=sys-libs/glibc-2.2.4"
 
 SN="/usr/snavigator"
diff --git a/dev-util/strace/files/digest-strace-4.3 b/dev-util/strace/files/digest-strace-4.3
deleted file mode 100644
index 93f50ba6643a..000000000000
--- a/dev-util/strace/files/digest-strace-4.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fbded443acdbca2daccb3cc5e523836f strace-4.3.tar.bz2 268248
diff --git a/dev-util/strace/strace-4.3.ebuild b/dev-util/strace/strace-4.3.ebuild
deleted file mode 100644
index 817adbc22d64..000000000000
--- a/dev-util/strace/strace-4.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.3.ebuild,v 1.4 2002/07/11 06:30:25 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A usefull diagnostic, instructional, adn debugging tool"
-SRC_URI="mirror://sourceforge/strace/${P}.tar.bz2"
-HOMEPAGE="http://www.wi.leidenuniv.nl/~wichert/strace/"
-DEPEND="virtual/glibc"
-
-src_compile() {
-    cd ${S}
-    try ./configure --prefix=/usr
-    try make
-}
-
-src_install () {
-    cd ${S}
-    doman strace.1
-    dobin strace 
-    dobin strace-graph
-    dodoc ChangeLog COPYRIGHT CREDITS NEWS PORTING README* TODO
-}
-
-
-
-
diff --git a/dev-util/strace/strace-4.4.ebuild b/dev-util/strace/strace-4.4.ebuild
index edac86054eed..ca554fb3dccf 100644
--- a/dev-util/strace/strace-4.4.ebuild
+++ b/dev-util/strace/strace-4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.4.ebuild,v 1.4 2002/07/11 06:30:25 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.4.ebuild,v 1.5 2002/07/23 13:28:37 seemant Exp $
 
 # NOTE: For some reason, upstream has changed the naming scheme
 # for the tarballs to something quite lame:
@@ -20,8 +20,9 @@ SRC_URI3="http://belnet.dl.sourceforge.net/sourceforge/strace/strace_4.4-1.tar.g
 SRC_URI="${SRC_URI1} ${SRC_URI2} ${SRC_URI3}"
 HOMEPAGE="http://www.wi.leidenuniv.nl/~wichert/strace/"
 
-LICENSE="as-is"
 SLOT="0"
+LICENSE="as-is"
+KEYWORDS="x86"
 
 DEPEND="virtual/glibc sys-devel/autoconf"
 RDEPEND="${DEPEND}"
diff --git a/dev-util/subversion/subversion-0.10_pre1.ebuild b/dev-util/subversion/subversion-0.10_pre1.ebuild
index f3d092e1179f..c451c6737da5 100644
--- a/dev-util/subversion/subversion-0.10_pre1.ebuild
+++ b/dev-util/subversion/subversion-0.10_pre1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-0.10_pre1.ebuild,v 1.2 2002/07/11 06:30:25 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-0.10_pre1.ebuild,v 1.3 2002/07/23 13:28:37 seemant Exp $
 
 S=${WORKDIR}/svn
 S_APACHE=${WORKDIR}/httpd-2.0
@@ -22,15 +22,17 @@ SRC_URI="http://www.sleepycat.com/update/4.0.14/db-4.0.14.tar.gz
 	http://www.gbevin.com/gentoo/svn-200202261456.tar.bz2"
 HOMEPAGE="http://subversion.tigris.org/"
 
-DEPEND="virtual/glibc
-	>=dev-lang/python-2.0
+SLOT="0"
+LICENSE="Apache-1.1"
+KEYWORDS="x86"
+
+DEPEND=">=dev-lang/python-2.0
 	>=sys-apps/diffutils-2.7.7
 	>=sys-devel/libtool-1.4.1-r1
 	>=sys-devel/bison-1.28-r3
 	>=sys-devel/m4-1.4o-r2
 	>=net-misc/neon-0.19.2"
-RDEPEND="virtual/glibc
-	>=dev-lang/python-2.0
+RDEPEND=">=dev-lang/python-2.0
 	>=sys-apps/diffutils-2.7.7
 	>=sys-devel/m4-1.4o-r2
 	>=net-misc/neon-0.19.2"
diff --git a/dev-util/tkcvs/tkcvs-6.4-r2.ebuild b/dev-util/tkcvs/tkcvs-6.4-r2.ebuild
index fa4c84d09e1a..d2f4484aed1f 100644
--- a/dev-util/tkcvs/tkcvs-6.4-r2.ebuild
+++ b/dev-util/tkcvs/tkcvs-6.4-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-util/tkcvs/tkcvs-6.4-r2.ebuild,v 1.2 2002/07/11 06:30:25 drobbins Exp $
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/tkcvs/tkcvs-6.4-r2.ebuild,v 1.3 2002/07/23 13:28:37 seemant Exp $
 
 
 S=${WORKDIR}/${P}
@@ -8,8 +8,11 @@ DESCRIPTION="TkCVS"
 SRC_URI="http://www.twobarleycorns.net/${P}.tar.gz"
 HOMEPAGE="http://www.twobarleycorns.net/tkcvs.html" 
 
-RDEPEND="virtual/glibc
-	>=dev-lang/tk-8.1.1"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
+RDEPEND=">=dev-lang/tk-8.1.1"
 
 src_compile() {                           
 	echo "It's tcl, you don't need to compile.  ;)"
@@ -27,37 +30,38 @@ src_install() {
 	dobin tkdiff/tkdiff
 
 	insinto /usr/lib/tkcvs
-	doins 	tkcvs/modtree.tcl tkcvs/cvs.tcl tkcvs/reports.tcl 	\
-              	tkcvs/tooltips.tcl tkcvs/tkcvs_def.tcl 			\
-		tkcvs/gen_log.tcl tkcvs/logcanvas.tcl tkcvs/dialog.tcl 	\
-		tkcvs/import.tcl tkcvs/merge.tcl tkcvs/errors.tcl 	\
-		tkcvs/static.tcl tkcvs/search.tcl tkcvs/filebrowse.tcl 	\
-		tkcvs/modules.tcl tkcvs/commit.tcl tkcvs/modbrowse.tcl 	\
+	doins \
+		tkcvs/modtree.tcl tkcvs/cvs.tcl tkcvs/reports.tcl \
+		tkcvs/tooltips.tcl tkcvs/tkcvs_def.tcl \
+		tkcvs/gen_log.tcl tkcvs/logcanvas.tcl tkcvs/dialog.tcl \
+		tkcvs/import.tcl tkcvs/merge.tcl tkcvs/errors.tcl \
+		tkcvs/static.tcl tkcvs/search.tcl tkcvs/filebrowse.tcl \
+		tkcvs/modules.tcl tkcvs/commit.tcl tkcvs/modbrowse.tcl \
 		tkcvs/workdir.tcl tkcvs/help.tcl tkcvs/tclIndex
 
 	insinto /usr/lib/tkcvs/bitmaps
-	doins 	bitmaps/edit.gif bitmaps/files.gif 			\
-		bitmaps/loop-glasses.gif bitmaps/clean.gif 		\
-		bitmaps/clear.gif bitmaps/tclfish.gif bitmaps/diff.gif 	\
-		bitmaps/fileview.gif bitmaps/dir.gif 			\
-		bitmaps/loop-half.gif bitmaps/conflict.gif 		\
-		bitmaps/patches.gif bitmaps/fileedit.gif 		\
-		bitmaps/arrow_hl_up.gif bitmaps/branchtag.gif 		\
-		bitmaps/branch.gif bitmaps/checkin.gif bitmaps/tag.gif 	\
-		bitmaps/logfile.gif bitmaps/refresh.gif 		\
-		bitmaps/arrow_dn.gif bitmaps/remove.gif bitmaps/mod.gif	\
-		bitmaps/import.gif bitmaps/patchfile.gif 		\
-		bitmaps/checkout.gif bitmaps/add.gif 			\
-		bitmaps/mergebranch.gif bitmaps/tags.gif 		\
-		bitmaps/adir.gif bitmaps/arrow_up.gif bitmaps/arrow.gif	\
-		bitmaps/unedit.gif bitmaps/delete.gif bitmaps/mdir.gif	\
-		bitmaps/modules.gif bitmaps/ball.gif bitmaps/who.gif	\
-		bitmaps/export.gif bitmaps/loop.gif 			\
-		bitmaps/modbrowse.gif bitmaps/mergediff.gif		\
-		bitmaps/arrow_hl_dn.gif bitmaps/amod.gif 		\
-		bitmaps/tclfish.xbm bitmaps/tkcvs32.xbm 		\
-		bitmaps/tkcvs48.xbm bitmaps/tkcvs32_mask.xbm 		\
-		bitmaps/tclfish_fly.xbm bitmaps/modbrowse.xbm		\
+	doins 	bitmaps/edit.gif bitmaps/files.gif \
+		bitmaps/loop-glasses.gif bitmaps/clean.gif \
+		bitmaps/clear.gif bitmaps/tclfish.gif bitmaps/diff.gif \
+		bitmaps/fileview.gif bitmaps/dir.gif \
+		bitmaps/loop-half.gif bitmaps/conflict.gif \
+		bitmaps/patches.gif bitmaps/fileedit.gif \
+		bitmaps/arrow_hl_up.gif bitmaps/branchtag.gif \
+		bitmaps/branch.gif bitmaps/checkin.gif bitmaps/tag.gif \
+		bitmaps/logfile.gif bitmaps/refresh.gif \
+		bitmaps/arrow_dn.gif bitmaps/remove.gif bitmaps/mod.gif \
+		bitmaps/import.gif bitmaps/patchfile.gif \
+		bitmaps/checkout.gif bitmaps/add.gif \
+		bitmaps/mergebranch.gif bitmaps/tags.gif \
+		bitmaps/adir.gif bitmaps/arrow_up.gif bitmaps/arrow.gif \
+		bitmaps/unedit.gif bitmaps/delete.gif bitmaps/mdir.gif \
+		bitmaps/modules.gif bitmaps/ball.gif bitmaps/who.gif \
+		bitmaps/export.gif bitmaps/loop.gif \
+		bitmaps/modbrowse.gif bitmaps/mergediff.gif \
+		bitmaps/arrow_hl_dn.gif bitmaps/amod.gif \
+		bitmaps/tclfish.xbm bitmaps/tkcvs32.xbm \
+		bitmaps/tkcvs48.xbm bitmaps/tkcvs32_mask.xbm \
+		bitmaps/tclfish_fly.xbm bitmaps/modbrowse.xbm \
 		bitmaps/trace.xbm 
 
 	newman tkcvs/tkcvs.n tkcvs.1
diff --git a/dev-util/tmake/files/digest-tmake-1.6 b/dev-util/tmake/files/digest-tmake-1.6
deleted file mode 100644
index 4772b651429f..000000000000
--- a/dev-util/tmake/files/digest-tmake-1.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3b4cd646041a8016a21c805be7ead09c tmake-1.6.tar.gz 45320
diff --git a/dev-util/tmake/tmake-1.6.ebuild b/dev-util/tmake/tmake-1.6.ebuild
deleted file mode 100644
index 6f313fc2c59c..000000000000
--- a/dev-util/tmake/tmake-1.6.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-util/tmake/tmake-1.6.ebuild,v 1.3 2002/07/11 06:30:25 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A Cross platform Makefile tool"
-SRC_URI="ftp://ftp.trolltech.com/freebies/tmake/${P}.tar.gz"
-HOMEPAGE="http://www.trolltech.com/products/download/freebies/tmake.html"
-
-RDEPEND="sys-devel/perl"
-
-src_install () {
-
-    cd ${S}
-    dobin bin/tmake bin/progen
-    dodir /usr/lib/tmake
-    cp -af ${S}/lib/* ${D}/usr/lib/tmake
-    dodoc CHANGES LICENSE README
-    docinto html
-    dodoc doc/*.html
-    
-
-}
-
diff --git a/dev-util/tmake/tmake-1.8-r1.ebuild b/dev-util/tmake/tmake-1.8-r1.ebuild
index 53cd68e0d497..96a855799515 100644
--- a/dev-util/tmake/tmake-1.8-r1.ebuild
+++ b/dev-util/tmake/tmake-1.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-util/tmake/tmake-1.8-r1.ebuild,v 1.2 2002/07/04 08:14:29 seemant Exp $
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/tmake/tmake-1.8-r1.ebuild,v 1.3 2002/07/23 13:28:37 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A Cross platform Makefile tool"
@@ -9,8 +9,9 @@ HOMEPAGE="http://www.trolltech.com/products/download/freebies/tmake.html"
 
 RDEPEND="sys-devel/perl"
 
+SLOT="0"
 LICENSE="as-is"
-SLOT=""
+KEYWORDS="x86"
 
 src_install () {
 
@@ -23,4 +24,3 @@ src_install () {
 	dodir /etc/env.d
 	echo "TMAKEPATH=/usr/lib/tmake/linux-g++" > ${D}/etc/env.d/51tmake
 }
-
diff --git a/dev-util/uml/uml-1.0.3.ebuild b/dev-util/uml/uml-1.0.3.ebuild
index 1ab2d7d0b3e9..e9f97535b4d5 100644
--- a/dev-util/uml/uml-1.0.3.ebuild
+++ b/dev-util/uml/uml-1.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-util/uml/uml-1.0.3.ebuild,v 1.4 2002/07/11 06:30:25 drobbins Exp $
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/uml/uml-1.0.3.ebuild,v 1.5 2002/07/23 13:28:37 seemant Exp $
 
 inherit kde-base
  
@@ -8,13 +8,16 @@ DESCRIPTION="KDE 2.2 UML Drawing Utility"
 SRC_URI="mirror://sourceforge/uml/${P}-1.tar.gz"
 HOMEPAGE="http://uml.sourceforge.net"
 
-newdepend ">=kde-base/kdebase-2.2 virtual/glibc"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
+newdepend ">=kde-base/kdebase-2.2"
 
 need-kde 2.2
 
 src_compile() {
 	kde_src_compile myconf
-	myconf="$myconf --mandir=${D}/usr/share/man"
+	myconf="${myconf} --mandir=${D}/usr/share/man"
 	kde_src_compile configure make
 }
-
diff --git a/dev-util/usermode/ChangeLog b/dev-util/usermode/ChangeLog
index ad059ca1ef3f..fcb387aa6333 100644
--- a/dev-util/usermode/ChangeLog
+++ b/dev-util/usermode/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/usermode
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-util/usermode/ChangeLog,v 1.2 2002/04/28 00:49:08 blocke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/usermode/ChangeLog,v 1.3 2002/07/23 13:28:37 seemant Exp $
+
+*usermode-20020718 (23 Jul 2002)
+
+  23 Jul 2002; Seemant Kulleen <seemant@gentoo.org> usermode-20020718.ebuild :
+
+  Version bump thanks to sasquach in #gentoo
 
 *usermode-20020415 (27 Apr 2002)
 
@@ -8,5 +14,3 @@
 
   Bumped to new version and quick change to ebuild to make it more version
   independent.
-
-
diff --git a/dev-util/usermode/files/digest-usermode-20020718 b/dev-util/usermode/files/digest-usermode-20020718
new file mode 100644
index 000000000000..811557321f41
--- /dev/null
+++ b/dev-util/usermode/files/digest-usermode-20020718
@@ -0,0 +1 @@
+MD5 62474997d033df272b65ba5019be2e16 uml_utilities_20020718.tar.bz2 32673
diff --git a/dev-util/usermode/usermode-20020718.ebuild b/dev-util/usermode/usermode-20020718.ebuild
new file mode 100644
index 000000000000..9df951e95729
--- /dev/null
+++ b/dev-util/usermode/usermode-20020718.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/usermode/usermode-20020718.ebuild,v 1.1 2002/07/23 13:28:37 seemant Exp $
+
+S=${WORKDIR}/tools
+DESCRIPTION="Tools for use with Usermode Linux virtual machines"
+SRC_URI="mirror://sourceforge/user-mode-linux/uml_utilities_${PV}.tar.bz2"
+HOMEPAGE="http://user-mode-linux.sourceforge.net/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
+DEPEND="virtual/glibc"
+
+src_compile() {
+
+	emake CFLAGS="${CFLAGS} -D_LARGEFILE64_SOURCE -g -Wall" all
+}
+
+src_install () {
+
+	make DESTDIR=${D} install
+
+	dodoc COPYING 	
+}
diff --git a/dev-util/vdkbuilder/vdkbuilder-2.0.2.ebuild b/dev-util/vdkbuilder/vdkbuilder-2.0.2.ebuild
index c09e8ff5deb3..789e313ac3e6 100644
--- a/dev-util/vdkbuilder/vdkbuilder-2.0.2.ebuild
+++ b/dev-util/vdkbuilder/vdkbuilder-2.0.2.ebuild
@@ -1,29 +1,33 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-util/vdkbuilder/vdkbuilder-2.0.2.ebuild,v 1.2 2002/06/20 00:12:16 bass Exp $
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/vdkbuilder/vdkbuilder-2.0.2.ebuild,v 1.3 2002/07/23 13:28:37 seemant Exp $
 
-S="${WORKDIR}/vdk-2.0.2"
+MY_P=${P/builder/}
+S=${WORKDIR}/${MY_P}
 DESCRIPTION="A RAD Application Development tool based on VDK (The Visual Development Kit)."
-SRC_URI="mirror://sourceforge/vdkbuilder/vdk-2.0.2.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 HOMEPAGE="vdkbuilder.sf.net"
+
+SLOT="0"
 LICENSE="GPL-2"
+KEYWORDS="x86"
+
 DEPEND="dev-libs/atk
-		x11-libs/pango
-		dev-libs/glib
-		dev-util/pkgconfig
-		>=x11-libs/gtk+-2.0.3
-		app-doc/doxygen
-gnome? ( gnome-base/libgnome )"
-RDEPEND="${DEPEND}"
-SLOT="0"
+	x11-libs/pango
+	dev-libs/glib
+	dev-util/pkgconfig
+	>=x11-libs/gtk+-2.0.3
+	app-doc/doxygen
+	gnome? ( gnome-base/libgnome )"
 
 src_compile() {
 
     local myconf
-	    use nls \
+	use nls \
 		&& myconf="${myconf} --enable-nls" \
 		|| myconf="${myconf} --disable-nls"
-		use gnome \
+
+	use gnome \
 		&& myconf="${myconf} --enable-gnome=yes" \
 		|| myconf="${myconf} --enable-gnome=no"
 							  
diff --git a/dev-util/xdelta/xdelta-1.1.3.ebuild b/dev-util/xdelta/xdelta-1.1.3.ebuild
index e8d4d7c3fb48..19b5d7741ee4 100644
--- a/dev-util/xdelta/xdelta-1.1.3.ebuild
+++ b/dev-util/xdelta/xdelta-1.1.3.ebuild
@@ -1,24 +1,25 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xdelta/xdelta-1.1.3.ebuild,v 1.4 2002/07/11 06:30:25 drobbins Exp $
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xdelta/xdelta-1.1.3.ebuild,v 1.5 2002/07/23 13:28:37 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Computes changes between binary or text files and creates deltas"
 SRC_URI="mirror://sourceforge/xdelta/${P}.tar.gz"
 HOMEPAGE="http://xdelta.sourceforge.net"
-DEPEND="virtual/glibc
-        =dev-libs/glib-1.2*
-        >=sys-libs/zlib-1.1.3"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
+DEPEND="=dev-libs/glib-1.2*
+	>=sys-libs/zlib-1.1.4"
 
 src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man || die "./configure failed"
+	econf || die "./configure failed"
 	emake || die
 }
 
 src_install () {
 	make DESTDIR=${D} install || die
-        dodoc AUTHORS ChangeLog COPYING NEWS README
+	dodoc AUTHORS ChangeLog COPYING NEWS README
 }
diff --git a/dev-util/xxdiff/files/digest-xxdiff-2.5 b/dev-util/xxdiff/files/digest-xxdiff-2.5
deleted file mode 100644
index b9ea2f0ef8c5..000000000000
--- a/dev-util/xxdiff/files/digest-xxdiff-2.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2365d0d1b157b4bd3dac7bf290ebe7cc xxdiff-2.5.tar.gz 783991
diff --git a/dev-util/xxdiff/xxdiff-2.5.ebuild b/dev-util/xxdiff/xxdiff-2.5.ebuild
deleted file mode 100644
index 0c90a21e28b9..000000000000
--- a/dev-util/xxdiff/xxdiff-2.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2001 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/dev-util/xxdiff/xxdiff-2.5.ebuild,v 1.2 2002/05/27 17:27:38 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A graphical file comparator and merge tool simular to xdiff."
-SRC_URI="mirror://sourceforge/xxdiff/${P}.tar.gz"
-HOMEPAGE="http://xxdiff.sourceforge.net/"
-
-DEPEND="virtual/glibc
-	=x11-libs/qt-2.3*
-	>=dev-util/tmake-1.8-r1
-	>=sys-devel/gcc-2.95.3"
-
-RDEPEND="sys-apps/diffutils"
-
-src_compile() {
-	export QTDIR=/usr/qt/2
-	cd src
-	tmake -o Makefile xxdiff.pro
-
-	emake || die
-}
-
-src_install () {
-	dobin src/xxdiff
-	newman src/xxdiff.man xxdiff.1
-	dodoc README COPYING CHANGES TODO
-	dodoc copyright.txt doc/xxdiff-doc.sgml
-}
-
-# vim: ai et sw=4 ts=4
diff --git a/dev-util/xxdiff/xxdiff-2.6.ebuild b/dev-util/xxdiff/xxdiff-2.6.ebuild
index ca49a1d8ad2f..e614f1d6313e 100644
--- a/dev-util/xxdiff/xxdiff-2.6.ebuild
+++ b/dev-util/xxdiff/xxdiff-2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-2.6.ebuild,v 1.1 2002/07/02 05:05:40 seemant Exp $
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-2.6.ebuild,v 1.2 2002/07/23 13:28:37 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A graphical file comparator and merge tool simular to xdiff."
@@ -10,10 +10,12 @@ HOMEPAGE="http://xxdiff.sourceforge.net/"
 DEPEND="=x11-libs/qt-3*
 	>=dev-util/tmake-1.8-r1"
 
-RDEPEND="sys-apps/diffutils"
+RDEPEND="=x11-libs/qt-3*
+	sys-apps/diffutils"
 
-SLOT=""
-LICENSE="GPL"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
 
 src_compile() {
 	cd src
diff --git a/dev-util/yacc/yacc-1.9.1-r1.ebuild b/dev-util/yacc/yacc-1.9.1-r1.ebuild
index dd3447e1694c..449544b565f4 100644
--- a/dev-util/yacc/yacc-1.9.1-r1.ebuild
+++ b/dev-util/yacc/yacc-1.9.1-r1.ebuild
@@ -1,11 +1,17 @@
-# 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/dev-util/yacc/yacc-1.9.1-r1.ebuild,v 1.7 2002/07/11 06:30:25 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/yacc/yacc-1.9.1-r1.ebuild,v 1.8 2002/07/23 13:28:37 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Yacc"
 SRC_URI="ftp://metalab.unc.edu/pub/Linux/devel/compiler-tools/${P}.tar.Z"
-DEPEND=">=sys-libs/glibc-2.1.3"
+HOMEPAGE="http://dinosaur.compilertools.net/#yacc"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="x86"
+
+DEPEND="virtual/glibc"
 
 src_unpack () {
 	unpack ${A}