repoman'd

54 files changed, 275 insertions, 797 deletions

diff --git a/dev-util/ebuilder/ebuilder-0.2.ebuild b/dev-util/ebuilder/ebuilder-0.2.ebuild
deleted file mode 100644
index b91c902569bf..000000000000
--- a/dev-util/ebuilder/ebuilder-0.2.ebuild
+++ /dev/null
@@ -1,30 +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/ebuilder/ebuilder-0.2.ebuild,v 1.3 2002/07/11 06:30:25 drobbins Exp $
-
-# This ebuild was generated by Ebuilder v0.2.
-
-S="${WORKDIR}/${P}"
-DESCRIPTION="Package Builder for Gentoo Linux"
-SRC_URI="http://www.disinformation.ca/gentoo/${P}.tar.gz"
-HOMEPAGE="http://www.disinformation.ca/gentoo"
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	echo "Nothing to compile for ${P}."
-}
-
-src_install () {
-	dodir /usr/share/ebuilder
-	dodir /usr/share/ebuilder/templates
-
-	insinto /usr/share/ebuilder/templates
-	doins templates/beginner.ebuild
-	doins templates/expert.ebuild
-
-	dosbin ebuilder
-
-	# Install documentation.
-	dodoc AUTHORS COPYING NEWS README TODO
-}
diff --git a/dev-util/ebuilder/ebuilder-0.3.ebuild b/dev-util/ebuilder/ebuilder-0.3.ebuild
deleted file mode 100644
index 16b3e13452a2..000000000000
--- a/dev-util/ebuilder/ebuilder-0.3.ebuild
+++ /dev/null
@@ -1,28 +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/ebuilder/ebuilder-0.3.ebuild,v 1.2 2002/07/11 06:30:25 drobbins Exp $
-
-S="${WORKDIR}/${P}"
-DESCRIPTION="Package Builder for Gentoo Linux"
-SRC_URI="http://www.disinformation.ca/gentoo/${P}.tar.gz"
-HOMEPAGE="http://www.disinformation.ca/gentoo"
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	echo "Nothing to compile for ${P}."
-}
-
-src_install () {
-	dodir /usr/share/ebuilder
-	dodir /usr/share/ebuilder/templates
-
-	insinto /usr/share/ebuilder/templates
-	doins templates/beginner.ebuild
-	doins templates/expert.ebuild
-
-	dosbin ebuilder
-
-	# Install documentation.
-	dodoc AUTHORS COPYING NEWS README TODO
-}
diff --git a/dev-util/ebuilder/ebuilder-0.4-r1.ebuild b/dev-util/ebuilder/ebuilder-0.4-r1.ebuild
index b3e9ffe19c93..7bc8f2fd9402 100644
--- a/dev-util/ebuilder/ebuilder-0.4-r1.ebuild
+++ b/dev-util/ebuilder/ebuilder-0.4-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/dev-util/ebuilder/ebuilder-0.4-r1.ebuild,v 1.2 2002/07/11 06:30:25 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ebuilder/ebuilder-0.4-r1.ebuild,v 1.3 2002/07/23 11:22:17 seemant Exp $
 
 S="${WORKDIR}/${P}"
 DESCRIPTION="Package Builder for Gentoo Linux"
 SRC_URI="http://www.disinformation.ca/gentoo/${P}.tar.gz"
 HOMEPAGE="http://www.disinformation.ca/gentoo"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
 DEPEND="net-misc/wget"
 RDEPEND="$DEPEND"
-LICENSE="GPL-2"
-SLOT="0"
 
 src_compile() {
 	echo "Nothing to compile for ${P}."
diff --git a/dev-util/ebuilder/files/digest-ebuilder-0.2 b/dev-util/ebuilder/files/digest-ebuilder-0.2
deleted file mode 100644
index 6454a321e173..000000000000
--- a/dev-util/ebuilder/files/digest-ebuilder-0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f590dd6e6f220cf1fe0d8eac8ff61a16 ebuilder-0.2.tar.gz 18217
diff --git a/dev-util/ebuilder/files/digest-ebuilder-0.3 b/dev-util/ebuilder/files/digest-ebuilder-0.3
deleted file mode 100644
index 8fc49538a037..000000000000
--- a/dev-util/ebuilder/files/digest-ebuilder-0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5f37af8fd3d8d77d3b1d9ecc4ba6f3d5 ebuilder-0.3.tar.gz 20966
diff --git a/dev-util/eclipse-cdt-bin/eclipse-cdt-bin-20020704.ebuild b/dev-util/eclipse-cdt-bin/eclipse-cdt-bin-20020704.ebuild
index 3c0be59aaaf1..a83866108729 100644
--- a/dev-util/eclipse-cdt-bin/eclipse-cdt-bin-20020704.ebuild
+++ b/dev-util/eclipse-cdt-bin/eclipse-cdt-bin-20020704.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/dev-util/eclipse-cdt-bin/eclipse-cdt-bin-20020704.ebuild,v 1.2 2002/07/14 05:49:26 blocke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-cdt-bin/eclipse-cdt-bin-20020704.ebuild,v 1.3 2002/07/23 11:22:17 seemant Exp $
 
+S=${WORKDIR}/eclipse
 DESCRIPTION="Eclipse Tools Platform"
 HOMEPAGE="http://www.eclipse.org"
 SRC_URI="http://download.eclipse.org/tools/cdt/downloads/cdt/20020704-CDT-initial.zip"
-LICENSE="CPL-1.0"
+
 SLOT="2"
+LICENSE="CPL-1.0"
 KEYWORDS="x86"
+
 DEPEND="=dev-util/eclipse-platform-bin-2.0*"
-RDEPEND="$DEPEND"
-S=${WORKDIR}/eclipse
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	mkdir ${S}
diff --git a/dev-util/eclipse-ftp-webdav-bin/eclipse-ftp-webdav-bin-2.0.ebuild b/dev-util/eclipse-ftp-webdav-bin/eclipse-ftp-webdav-bin-2.0.ebuild
index b7280b29d0d5..f5357898d9b9 100644
--- a/dev-util/eclipse-ftp-webdav-bin/eclipse-ftp-webdav-bin-2.0.ebuild
+++ b/dev-util/eclipse-ftp-webdav-bin/eclipse-ftp-webdav-bin-2.0.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/dev-util/eclipse-ftp-webdav-bin/eclipse-ftp-webdav-bin-2.0.ebuild,v 1.2 2002/07/14 05:50:27 blocke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-ftp-webdav-bin/eclipse-ftp-webdav-bin-2.0.ebuild,v 1.3 2002/07/23 11:22:17 seemant Exp $
 
+S=${WORKDIR}/eclipse
 DESCRIPTION="Eclipse FTP and WebDAV Tool"
 HOMEPAGE="http://www.eclipse.org"
 SRC_URI="http://64.38.198.171/downloads/drops/R-2.0-200206271835/eclipse-FTP-WebDAV-2.0.zip"
-LICENSE="CPL-1.0"
+
 SLOT="2"
+LICENSE="CPL-1.0"
 KEYWORDS="x86"
+
 DEPEND="=dev-util/eclipse-platform-bin-2.0*"
-RDEPEND="$DEPEND"
-S=${WORKDIR}/eclipse
+RDEPEND="${DEPEND}"
 
 src_install () {
 	dodir /opt/eclipse
diff --git a/dev-util/eclipse-jdt-bin/eclipse-jdt-bin-2.0.ebuild b/dev-util/eclipse-jdt-bin/eclipse-jdt-bin-2.0.ebuild
index 0321b4bdd38d..a3c723f93d1f 100644
--- a/dev-util/eclipse-jdt-bin/eclipse-jdt-bin-2.0.ebuild
+++ b/dev-util/eclipse-jdt-bin/eclipse-jdt-bin-2.0.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/dev-util/eclipse-jdt-bin/eclipse-jdt-bin-2.0.ebuild,v 1.2 2002/07/14 05:47:53 blocke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-jdt-bin/eclipse-jdt-bin-2.0.ebuild,v 1.3 2002/07/23 11:22:17 seemant Exp $
 
+S=${WORKDIR}/eclipse
 DESCRIPTION="Eclipse Tools Platform"
 HOMEPAGE="http://www.eclipse.org"
 SRC_URI="http://64.38.198.171/downloads/drops/R-2.0-200206271835/eclipse-JDT-2.0.zip"
-LICENSE="CPL-1.0"
+
 SLOT="2"
+LICENSE="CPL-1.0"
 KEYWORDS="x86"
+
 DEPEND="=dev-util/eclipse-platform-bin-2.0*"
-RDEPEND="$DEPEND"
-S=${WORKDIR}/eclipse
+RDEPEND="${DEPEND}"
 
 src_install () {
 	dodir /opt/eclipse
diff --git a/dev-util/eclipse-platform-bin/eclipse-platform-bin-2.0.ebuild b/dev-util/eclipse-platform-bin/eclipse-platform-bin-2.0.ebuild
index 834a7aa18a26..48e80736ef68 100644
--- a/dev-util/eclipse-platform-bin/eclipse-platform-bin-2.0.ebuild
+++ b/dev-util/eclipse-platform-bin/eclipse-platform-bin-2.0.ebuild
@@ -1,17 +1,19 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-platform-bin/eclipse-platform-bin-2.0.ebuild,v 1.1 2002/07/13 23:59:04 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-platform-bin/eclipse-platform-bin-2.0.ebuild,v 1.2 2002/07/23 11:22:17 seemant Exp $
 
+S=${WORKDIR}/eclipse
 DESCRIPTION="Eclipse Tools Platform"
 HOMEPAGE="http://www.eclipse.org"
 SRC_URI="http://64.38.198.171/downloads/drops/R-2.0-200206271835/eclipse-platform-2.0-linux-gtk.zip"
-LICENSE="CPL-1.0"
+
 SLOT="2"
+LICENSE="CPL-1.0"
 KEYWORDS="x86"
+
 DEPEND=">=virtual/jdk-1.2
 	=x11-libs/gtk+-2.0*"
-RDEPEND="$DEPEND"
-S=${WORKDIR}/eclipse
+RDEPEND="${DEPEND}"
 
 src_install () {
 	dodir /opt/eclipse
diff --git a/dev-util/efence/efence-2.2.2.ebuild b/dev-util/efence/efence-2.2.2.ebuild
index c470105f6f23..e5adcfdac5b9 100644
--- a/dev-util/efence/efence-2.2.2.ebuild
+++ b/dev-util/efence/efence-2.2.2.ebuild
@@ -1,12 +1,16 @@
-# 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/efence/efence-2.2.2.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/efence/efence-2.2.2.ebuild,v 1.4 2002/07/23 11:22:17 seemant Exp $
 
 S=${WORKDIR}/ElectricFence-${PV}
 DESCRIPTION="malloc() debugger for Linux and Unix."
 SRC_URI="ftp://ftp.perens.com/pub/ElectricFence/Beta/ElectricFence-${PV}.tar.gz"
 HOMEPAGE="http://perens.com/FreeSoftware/"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
 DEPEND="virtual/glibc"
 
 src_compile() {
@@ -18,11 +22,11 @@ src_install () {
 	dodir /usr/lib
 	dodir /usr/share/man/man3
 
-	make BIN_INSTALL_DIR=${D}/usr/bin				\
-	     LIB_INSTALL_DIR=${D}/usr/lib				\
-	     MAN_INSTALL_DIR=${D}/usr/share/man/man3			\
-	     install
-	assert "Installation of package failed."
+	make \
+		BIN_INSTALL_DIR=${D}/usr/bin \
+		LIB_INSTALL_DIR=${D}/usr/lib \
+		MAN_INSTALL_DIR=${D}/usr/share/man/man3 \
+		install || die
 
 	dodoc CHANGES COPYING README
 }
diff --git a/dev-util/fhist/fhist-1.8.ebuild b/dev-util/fhist/fhist-1.8.ebuild
index b2218bc5b883..a9a35c17d168 100644
--- a/dev-util/fhist/fhist-1.8.ebuild
+++ b/dev-util/fhist/fhist-1.8.ebuild
@@ -1,19 +1,23 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header:#
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/fhist/fhist-1.8.ebuild,v 1.3 2002/07/23 11:22:17 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="File history and comparison tools"
 SRC_URI="http://www.canb.auug.org.au/~millerp/${P}.tar.gz"
 HOMEPAGE="http://www.canb.auug.org.au/~millerp/fhist.html"
 
-DEPEND="sys-devel/gettext sys-apps/groff sys-devel/bison"
-RDEPEND=""
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
+DEPEND="sys-devel/gettext 
+	sys-apps/groff 
+	sys-devel/bison"
+RDEPEND="${DEPEND}"
 
 src_compile() {
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man || die "./configure failed"
+	econf || die "./configure failed"
 	make clean 
 	make || die
 }
@@ -28,6 +32,8 @@ src_install () {
 	rm -r ${D}/usr/share/fhist
 	
 	# move message catalogs into the usual gentoo place 
-	mkdir ${D}/usr/share/locale
+	dodir /usr/share/locale
 	mv ${D}/usr/lib/fhist/en ${D}/usr/share/locale/
+
+	dodoc LICENSE MANIFEST README
 }
diff --git a/dev-util/gcvs/files/digest-gcvs-1.0_beta2 b/dev-util/gcvs/files/digest-gcvs-1.0_beta2
deleted file mode 100644
index 2f29efd455d0..000000000000
--- a/dev-util/gcvs/files/digest-gcvs-1.0_beta2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 78cac5ec6c3463ece10a9b362b3965f7 gcvs-1.0b2.tar.gz 2975242
diff --git a/dev-util/gcvs/gcvs-1.0_beta2.ebuild b/dev-util/gcvs/gcvs-1.0_beta2.ebuild
deleted file mode 100644
index b7930af2de10..000000000000
--- a/dev-util/gcvs/gcvs-1.0_beta2.ebuild
+++ /dev/null
@@ -1,46 +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/gcvs/gcvs-1.0_beta2.ebuild,v 1.4 2002/07/11 06:30:25 drobbins Exp $
-
-Z="gcvs-1.0b2"
-S=${WORKDIR}/${Z}
-DESCRIPTION="GUI frontend for CVS from the CVSGUI project"
-SRC_URI="mirror://sourceforge/cvsgui/${Z}.tar.gz"
-HOMEPAGE="http://cvsgui.sourceforge.net/"
-
-DEPEND="=x11-libs/gtk+-1.2* >=dev-lang/tcl-8.3.3 sys-devel/perl sys-devel/bison dev-util/glademm"
-RDEPEND="=x11-libs/gtk+-1.2* >=dev-lang/tcl-8.3.3 >=dev-util/cvs-1.11-r1"
-
-src_compile() {
-
-	./make_configure || die 
-	./configure --prefix=/usr --host=${CHOST} || die
-
-	# Ladies and Gentlemen... The following is pure evil...
-	export HOME=${S}
-	# Yes, thats right... the build process ends up trying to create
-	# something in root's home directory... why?  they use glade,
-	# a full blown gnome gui application to generate source code...
-
-	# more evil... without this it builds its own copy of cvs
-	# which of course installs itself on top of the real cvs package
-	mv Makefile Makefile.old
-	sed 's|cvsunix||g' Makefile.old > Makefile
-
-	emake all || die
-
-}
-
-src_install () {
-
-	make prefix=${D}/usr install
-
-	# note: html docs ignored because they focus on the mac and windows
-	# version and seem to be of questionable use with gcvs
-
-	dodoc AUTHORS COPYING ChangeLog INSTALL README
-
-	
-}
-
-
diff --git a/dev-util/gcvs/gcvs-1.0_beta3.ebuild b/dev-util/gcvs/gcvs-1.0_beta3.ebuild
index 23e1d71554f9..c9aa73b393a4 100644
--- a/dev-util/gcvs/gcvs-1.0_beta3.ebuild
+++ b/dev-util/gcvs/gcvs-1.0_beta3.ebuild
@@ -1,15 +1,26 @@
 # 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/gcvs/gcvs-1.0_beta3.ebuild,v 1.2 2002/07/11 06:30:25 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gcvs/gcvs-1.0_beta3.ebuild,v 1.3 2002/07/23 11:22:17 seemant Exp $
 
-Z="gcvs-1.0b3"
-S=${WORKDIR}/${Z}
+MY_P=${P/eta/}
+MY_P=${MY_P/_/}
+S=${WORKDIR}/${MY_P}
 DESCRIPTION="GUI frontend for CVS from the CVSGUI project"
-SRC_URI="mirror://sourceforge/cvsgui/${Z}.tar.gz"
+SRC_URI="mirror://sourceforge/cvsgui/${MY_P}.tar.gz"
 HOMEPAGE="http://cvsgui.sourceforge.net/"
 
-DEPEND="=x11-libs/gtk+-1.2* >=dev-lang/tcl-8.3.3 sys-devel/perl sys-devel/bison dev-util/glademm"
-RDEPEND="=x11-libs/gtk+-1.2* >=dev-lang/tcl-8.3.3 >=dev-util/cvs-1.11-r1"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
+DEPEND="=x11-libs/gtk+-1.2* 
+	>=dev-lang/tcl-8.3.3 
+	sys-devel/perl 
+	sys-devel/bison
+	dev-util/glademm"
+
+RDEPEND="${DEPEND}
+	>=dev-util/cvs-1.11-r1"
 
 src_compile() {
 
@@ -42,5 +53,3 @@ src_install () {
 
 	
 }
-
-
diff --git a/dev-util/glade/files/digest-glade-0.6.2 b/dev-util/glade/files/digest-glade-0.6.2
deleted file mode 100644
index f38f87b559c5..000000000000
--- a/dev-util/glade/files/digest-glade-0.6.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 261c9a48441d2a884654b11a79c220ee glade-0.6.2.tar.gz 2191537
diff --git a/dev-util/glade/files/digest-glade-1.1.0 b/dev-util/glade/files/digest-glade-1.1.0
deleted file mode 100644
index 608cdc4647c2..000000000000
--- a/dev-util/glade/files/digest-glade-1.1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 da40a2c2a55e2e25dcc7f893cc896dd4 glade-1.1.0.tar.bz2 1550453
diff --git a/dev-util/glade/glade-0.6.2.ebuild b/dev-util/glade/glade-0.6.2.ebuild
deleted file mode 100644
index 6a6931c6073d..000000000000
--- a/dev-util/glade/glade-0.6.2.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/glade/glade-0.6.2.ebuild,v 1.11 2002/07/11 06:30:25 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="glade"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/glade/${P}.tar.gz"
-HOMEPAGE="http://glade.gnome.org/"
-
-RDEPEND="=x11-libs/gtk+-1.2*
-	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )
-	bonobo? ( >=gnome-base/bonobo-1.0.9-r1 )"
-
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext 
-	>=dev-util/intltool-0.11 )
-	>=app-text/scrollkeeper-0.2"
-
-src_compile() {
-	local myopts
-
-	if [ -z "`use gnome`" ]
-	then
-		myopts="--disable-gnome"
-	fi
-
-	if [ "`use bonobo`" ]
-	then
-		myopts="$myopts --with-bonobo"
-	else
-		myopts="$myopts --without-bonobo"
-	fi
-
-	if [ -z "`use nls`" ]
-	then
-		myopts="$myopts --disable-nls"
-	fi
-
-	if [ "$DEBUG" ]
-	then
-		myopts="$myopts --enable-debug"
-	fi
-
-	./configure --host=${CHOST} 					\
-		--prefix=/usr					\
-		--sysconfdir=/etc					\
-		--disable-gnome-db 					\
-		${myopts}  || die
-
-	emake || die
-}
-
-src_install() {
-	make prefix=${D}/usr 						\
-		sysconfdir=${D}/etc 					\
-		install || die
-
-	dodoc AUTHORS COPYING* FAQ NEWS README* TODO
-}
diff --git a/dev-util/glade/glade-0.6.4.ebuild b/dev-util/glade/glade-0.6.4.ebuild
index c009f801da0f..e850799827ad 100644
--- a/dev-util/glade/glade-0.6.4.ebuild
+++ b/dev-util/glade/glade-0.6.4.ebuild
@@ -1,59 +1,50 @@
 # 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/glade/glade-0.6.4.ebuild,v 1.2 2002/07/11 06:30:25 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-0.6.4.ebuild,v 1.3 2002/07/23 11:22:17 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="glade"
 SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/glade/${P}.tar.gz"
 HOMEPAGE="http://glade.gnome.org/"
 
-RDEPEND="=x11-libs/gtk+-1.2*
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
+DEPEND="=x11-libs/gtk+-1.2*
 	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )
 	bonobo? ( >=gnome-base/bonobo-1.0.9-r1 )"
 
-DEPEND="${RDEPEND}
+RDEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext 
-	>=dev-util/intltool-0.11 )
+		>=dev-util/intltool-0.11 )
 	>=app-text/scrollkeeper-0.2"
 
 src_compile() {
-	local myopts
+	local myconf
 
-	if [ -z "`use gnome`" ]
-	then
-		myopts="--disable-gnome"
-	fi
+	use gnome || myconf="--disable-gnome"
 
-	if [ "`use bonobo`" ]
-	then
-		myopts="$myopts --with-bonobo"
-	else
-		myopts="$myopts --without-bonobo"
-	fi
+	use bonobo \
+		&& myconf="${myconf} --with-bonobo" \
+		|| myconf="${myconf} --without-bonobo"
 
-	if [ -z "`use nls`" ]
-	then
-		myopts="$myopts --disable-nls"
-	fi
+	use nls || myconf="${myconf} --disable-nls"
 
 	if [ "$DEBUG" ]
 	then
-		myopts="$myopts --enable-debug"
+		myconf="${myconf} --enable-debug"
 	fi
 
-	./configure --host=${CHOST} 					\
-		--prefix=/usr					\
-		--sysconfdir=/etc					\
-		--disable-gnome-db 					\
-		${myopts}  || die
+	econf \
+		--disable-gnome-db \
+		${myconf}  || die
 
 	emake || die
 }
 
 src_install() {
-	make prefix=${D}/usr 						\
-		sysconfdir=${D}/etc 					\
-		install || die
+	einstall || die
 
 	dodoc AUTHORS COPYING* FAQ NEWS README* TODO
 }
diff --git a/dev-util/glade/glade-1.1.0-r1.ebuild b/dev-util/glade/glade-1.1.0-r1.ebuild
index 27016973a3b3..c6f319de179f 100644
--- a/dev-util/glade/glade-1.1.0-r1.ebuild
+++ b/dev-util/glade/glade-1.1.0-r1.ebuild
@@ -1,17 +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/dev-util/glade/glade-1.1.0-r1.ebuild,v 1.1 2002/06/02 18:28:25 stroke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-1.1.0-r1.ebuild,v 1.2 2002/07/23 11:22:17 seemant Exp $
 
 S=${WORKDIR}/${P}
-SLOT="0"
 DESCRIPTION="Glade is a GUI Builder. This release is for GTK+ 2 and GNOME 2."
 SRC_URI="ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/glade/${P}.tar.bz2"
-
 HOMEPAGE="http://glade.gnome.org/"
 
+SLOT="1"
 LICENSE="GPL-2"
+KEYWORDS="x86"
 
-RDEPEND="=x11-libs/gtk+-2.0*
+DEPEND="=x11-libs/gtk+-2*
 	=dev-libs/libxml2-2.4*
 	gnome? ( >=gnome-base/libgnomeui-1.117.1
 		>=gnome-base/libgnomecanvas-1.117.0
@@ -19,33 +19,29 @@ RDEPEND="=x11-libs/gtk+-2.0*
 		>=gnome-base/libgnomeprint-1.114.0 
 		>=gnome-base/libgnomeprintui-1.114.0 )"
 
-DEPEND="${RDEPEND}
+RDEPEND="${DEPEND}
 	nls? ( sys-devel/gettext
 		>=dev-util/intltool-0.11 )
 	>=app-text/scrollkeeper-0.2"
 
 src_compile() {
-	local myopts
-	use gnome || myopts="--disable-gnome"
-	use nls || myopts="${myopts} --disable-nls"
+	local myconf
+	use gnome || myconf="--disable-gnome"
+	use nls || myconf="${myconf} --disable-nls"
 
 	if [ "$DEBUG" ]
 	then	
-		myopts="$myopts --enable-debug"
+		myconf="$myconf --enable-debug"
 	fi
 
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--sysconfdir=/etc \
+	econf \
 		--disable-gnome-db \
-		${myopts}  || die
+		${myconf}  || die
 
 	emake || die
 }
 
 src_install() {
-	make prefix=${D}/usr \
-		sysconfdir=${D}/etc \
-		install || die
+	einstall || die
 	dodoc AUTHORS COPYING* FAQ NEWS README* TODO
 }
diff --git a/dev-util/glade/glade-1.1.0.ebuild b/dev-util/glade/glade-1.1.0.ebuild
deleted file mode 100644
index 9cdeccb065b7..000000000000
--- a/dev-util/glade/glade-1.1.0.ebuild
+++ /dev/null
@@ -1,51 +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/glade/glade-1.1.0.ebuild,v 1.3 2002/06/02 18:28:25 stroke Exp $
-
-S=${WORKDIR}/${P}
-SLOT="0"
-DESCRIPTION="Glade is a GUI Builder. This release is for GTK+ 2 and GNOME 2."
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/glade/${P}.tar.bz2"
-
-HOMEPAGE="http://glade.gnome.org/"
-
-LICENSE="GPL-2"
-
-RDEPEND="=x11-libs/gtk+-2.0*
-	=dev-libs/libxml2-2.4*
-	gnome? ( >=gnome-base/libgnomeui-1.117.1
-		>=gnome-base/libgnomecanvas-1.117.0
-		>=gnome-base/libbonoboui-1.117.0
-		>=gnome-extra/libgnomeprint-1.114.0 
-		>=gnome-extra/libgnomeprintui-1.114.0 )"
-
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext
-		>=dev-util/intltool-0.11 )
-	>=app-text/scrollkeeper-0.2"
-
-src_compile() {
-	local myopts
-	use gnome || myopts="--disable-gnome"
-	use nls || myopts="${myopts} --disable-nls"
-
-	if [ "$DEBUG" ]
-	then	
-		myopts="$myopts --enable-debug"
-	fi
-
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--disable-gnome-db \
-		${myopts}  || die
-
-	emake || die
-}
-
-src_install() {
-	make prefix=${D}/usr \
-		sysconfdir=${D}/etc \
-		install || die
-	dodoc AUTHORS COPYING* FAQ NEWS README* TODO
-}
diff --git a/dev-util/glademm/files/digest-glademm-0.5.11f b/dev-util/glademm/files/digest-glademm-0.5.11f
deleted file mode 100644
index d430943366e0..000000000000
--- a/dev-util/glademm/files/digest-glademm-0.5.11f
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e3d4e6261150852f586abea131fbc191 glademm-0.5_11f.tar.gz 287881
diff --git a/dev-util/glademm/glademm-0.5.11f.ebuild b/dev-util/glademm/glademm-0.5.11f.ebuild
deleted file mode 100644
index f9d180e58a4a..000000000000
--- a/dev-util/glademm/glademm-0.5.11f.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-MY_P="glademm-0.5_11f"
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="A C++ backend for glade, the GUI designer for Gtk."
-SRC_URI="http://home.wtal.de/petig/Gtk/${MY_P}.tar.gz"
-HOMEPAGE="http://home.wtal.de/petig/Gtk/"
-
-DEPEND=">=dev-util/glade-0.6.2"
-
-RDEPEND="=x11-libs/gtk+-1.2*
-	 >=x11-libs/gtkmm-1.2.5-r1
-	 >=dev-util/glade-0.6.2
-	 >=gnome-extra/gnomemm-1.2.0-r1"
-
-
-src_compile() {
-	./configure --host=${CHOST} 					\
-		    --prefix=/usr					\
-		    --sysconfdir=/etc
-	assert
-
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README TODO
-	docinto docs
-	dodoc docs/*.txt docs/*.html docs/glade.wishlist
-}
diff --git a/dev-util/glademm/glademm-0.6.2.ebuild b/dev-util/glademm/glademm-0.6.2.ebuild
index 7dad464f4844..413bb8524535 100644
--- a/dev-util/glademm/glademm-0.6.2.ebuild
+++ b/dev-util/glademm/glademm-0.6.2.ebuild
@@ -1,38 +1,31 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glademm/glademm-0.6.2.ebuild,v 1.6 2002/07/23 11:22:18 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A C++ backend for glade, the GUI designer for Gtk."
 SRC_URI="http://home.wtal.de/petig/Gtk/${P}.tar.gz"
 HOMEPAGE="http://home.wtal.de/petig/Gtk/"
 
-DEPEND=">=dev-util/glade-0.6.2"
-
-RDEPEND="=x11-libs/gtk+-1.2*
-	 >=x11-libs/gtkmm-1.2.5-r1
-	 >=dev-util/glade-0.6.2
-	 >=gnome-extra/gnomemm-1.2.0-r1"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
 
+DEPEND=">=dev-util/glade-0.6.2
+	=x11-libs/gtk+-1.2*
+	>=x11-libs/gtkmm-1.2.5-r1
+	>=dev-util/glade-0.6.2
+	>=gnome-extra/gnomemm-1.2.0-r1"
 
 src_compile() {
-	./configure --host=${CHOST} 					\
-		    --prefix=/usr					\
-		    --mandir=/usr/share/man				\
-		    --infodir=/usr/share/info				\
-		    --sysconfdir=/etc || die
-
+	econf || die
 	emake || die
 }
 
 src_install () {
-	make prefix=${D}/usr						\
-	     mandir=${D}/usr/share/man					\
-	     infodir=${D}/usr/share/info				\
-	     sysconfdir=${D}/etc					\
-	     install || die
 
+	einstall || die
 	dodoc AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README TODO
 	dodoc docs/*.txt docs/glade.wishlist
-	docinto html
-	dodoc docs/*.html
+	dohtml -r docs
 }
diff --git a/dev-util/glademm/glademm-1.1.0c.ebuild b/dev-util/glademm/glademm-1.1.0c.ebuild
index f9b6931785c9..7f1d4adb0f67 100644
--- a/dev-util/glademm/glademm-1.1.0c.ebuild
+++ b/dev-util/glademm/glademm-1.1.0c.ebuild
@@ -1,29 +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/glademm/glademm-1.1.0c.ebuild,v 1.1 2002/06/20 00:07:23 spider 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/glademm/glademm-1.1.0c.ebuild,v 1.2 2002/07/23 11:22:18 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A C++ backend for glade-2, the GUI designer for Gtk."
 SRC_URI="http://home.wtal.de/petig/Gtk/${P}.tar.gz"
 HOMEPAGE="http://home.wtal.de/petig/Gtk/"
 
-DEPEND=">=dev-util/glade-1.1.0"
-
-RDEPEND=">=x11-libs/gtk+-2.0.0
-	 >=x11-libs/gtkmm-1.3.5
-	 >=dev-util/glade-1.1.0
-	 >=gnome-extra/libgnomemm-1.3.3"
+SLOT="1"
+LICENSE="GPL-2"
+KEYWORDS="x86"
 
+DEPEND=">=dev-util/glade-1.1.0
+	>=x11-libs/gtk+-2.0.0
+	>=x11-libs/gtkmm-1.3.5
+	>=dev-util/glade-1.1.0
+	>=gnome-extra/libgnomemm-1.3.3"
 
 src_compile() {
-	econf
+	econf || die
 	make || die
 }
 
 src_install () {
-	einstall
-#	dodoc AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README TODO
-#	dodoc docs/*.txt docs/glade.wishlist
-#	docinto html
-#	dodoc docs/*.html
+	einstall || die
 }
diff --git a/dev-util/glimmer/files/digest-glimmer-1.1.9.1-r1 b/dev-util/glimmer/files/digest-glimmer-1.1.9.1-r1
deleted file mode 100644
index 665dabbe9adb..000000000000
--- a/dev-util/glimmer/files/digest-glimmer-1.1.9.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dc3a8262d412ebe9edf6bd6b5026fd77 glimmer-1.1.9-1.tar.gz 698580
diff --git a/dev-util/glimmer/files/digest-glimmer-1.2.1 b/dev-util/glimmer/files/digest-glimmer-1.2.1
deleted file mode 100644
index b4cdc7bfdcab..000000000000
--- a/dev-util/glimmer/files/digest-glimmer-1.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ca0a856b58f91b1bdef7f0828b31490a glimmer-1.2.1.tar.gz 801711
diff --git a/dev-util/glimmer/glimmer-1.1.9.1-r1.ebuild b/dev-util/glimmer/glimmer-1.1.9.1-r1.ebuild
deleted file mode 100644
index 1e2412e5a0f7..000000000000
--- a/dev-util/glimmer/glimmer-1.1.9.1-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2001 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
-
-P_VERSION="1.1.9-1"
-S=${WORKDIR}/glimmer-${P_VERSION}
-DESCRIPTION="All-purpose gnome code editor."
-SRC_URI="mirror://sourceforge/glimmer/${PN}-${P_VERSION}.tar.gz"
-HOMEPAGE="http://glimmer.sourceforge.net"
-
-DEPEND=">=gnome-base/gnome-libs-1.4.1.2-r1
-	>=gnome-base/ORBit-0.5.10-r1
-	>=gnome-base/gnome-vfs-1.0.2-r1
-	>=gnome-base/gnome-print-0.20"
-
-# These are requirements when build with --enable-python.
-# We should update this to build with --enable-python if USE=python,
-# some work might have to be done to make play with Python 2.X
-
-#	>=dev-lang/python-1.5.2
-#	>=dev-python/gnome-python-1.4.1"
-
-src_compile() {
-
-#--disable-python disable python scripting, needed to build with python-2.x
-# see homepage
-
-	# regex is included in glibc now, so disable buildin regex since it cause compile errors
-	mv src/gtkextext/gtkextext.h src/gtkextext/gtkextext.h.orig
-	sed -e 's/\#include "..\/regex\/regex.h"/\#include <regex.h>/' src/gtkextext/gtkextext.h.orig >src/gtkextext/gtkextext.h	
-	mv src/Makefile.am src/Makefile.am.orig
-	grep -v 'regex/libregex.a \\' src/Makefile.am.orig >src/Makefile.am.grep
-	sed -e 's/SUBDIRS \= regex gtkextext/SUBDIRS \= gtkextext/' src/Makefile.am.grep >src/Makefile.am
-	automake
-
-	./configure --disable-python --infodir=/usr/share/info --mandir=/usr/share/man --prefix=/usr --host=${CHOST} || die
-	
-	make || die
-}
-
-src_install () {
-	make prefix=${D}/usr sysconfdir=${D}/etc/gnome install || die
-	dodoc AUTHORS ABOUT-NLS ChangeLog NEWS PROPS TODO README INSTALL COPYING
-}
-
diff --git a/dev-util/glimmer/glimmer-1.2.1-r1.ebuild b/dev-util/glimmer/glimmer-1.2.1-r1.ebuild
index 8b50b5d50eb8..9aab5562ea17 100644
--- a/dev-util/glimmer/glimmer-1.2.1-r1.ebuild
+++ b/dev-util/glimmer/glimmer-1.2.1-r1.ebuild
@@ -1,20 +1,20 @@
 # 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/glimmer/glimmer-1.2.1-r1.ebuild,v 1.1 2002/07/04 13:20:55 stroke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glimmer/glimmer-1.2.1-r1.ebuild,v 1.2 2002/07/23 11:22:18 seemant Exp $
 
-P_VERSION="1.2.1"
 S=${WORKDIR}/glimmer-${P_VERSION}
 DESCRIPTION="All-purpose gnome code editor."
-SRC_URI="mirror://sourceforge/glimmer/${PN}-${P_VERSION}.tar.gz"
+SRC_URI="mirror://sourceforge/glimmer/${P}.tar.gz"
 HOMEPAGE="http://glimmer.sourceforge.net"
-LICENSE="GPL-2"
+
 SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
 
 DEPEND="=x11-libs/gtk+-1.2*
+	=gnome-base/gnome-vfs-1*
 	>=gnome-base/gnome-libs-1.4.1.7
 	>=gnome-base/ORBit-0.5.16
-	( >=gnome-base/gnome-vfs-1.0.2-r1
-	<gnome-base/gnome-vfs-2.0.0 )
 	>=gnome-base/gnome-print-0.35"
 
 # These are requirements when build with --enable-python.
@@ -37,7 +37,8 @@ src_compile() {
 	sed -e 's/SUBDIRS \= regex gtkextext/SUBDIRS \= gtkextext/' src/Makefile.am.grep >src/Makefile.am
 	automake
 
-	./configure --disable-python --infodir=/usr/share/info --mandir=/usr/share/man --prefix=/usr --host=${CHOST} || die
+	econf \
+		--disable-python || die
 	
 	make || die
 }
@@ -46,4 +47,3 @@ src_install () {
 	make prefix=${D}/usr sysconfdir=${D}/etc/gnome install || die
 	dodoc AUTHORS ABOUT-NLS ChangeLog NEWS PROPS TODO README INSTALL COPYING
 }
-
diff --git a/dev-util/glimmer/glimmer-1.2.1.ebuild b/dev-util/glimmer/glimmer-1.2.1.ebuild
deleted file mode 100644
index d36d0741a878..000000000000
--- a/dev-util/glimmer/glimmer-1.2.1.ebuild
+++ /dev/null
@@ -1,47 +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/glimmer/glimmer-1.2.1.ebuild,v 1.1 2002/06/03 14:23:42 stroke Exp $
-
-P_VERSION="1.2.1"
-S=${WORKDIR}/glimmer-${P_VERSION}
-DESCRIPTION="All-purpose gnome code editor."
-SRC_URI="mirror://sourceforge/glimmer/${PN}-${P_VERSION}.tar.gz"
-HOMEPAGE="http://glimmer.sourceforge.net"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=gnome-base/gnome-libs-1.4.1.2-r1
-	>=gnome-base/ORBit-0.5.10-r1
-	>=gnome-base/gnome-vfs-1.0.2-r1
-	>=gnome-base/gnome-print-0.20"
-
-# These are requirements when build with --enable-python.
-# We should update this to build with --enable-python if USE=python,
-# some work might have to be done to make play with Python 2.X
-
-#	>=dev-lang/python-1.5.2
-#	>=dev-python/gnome-python-1.4.1"
-
-src_compile() {
-
-#--disable-python disable python scripting, needed to build with python-2.x
-# see homepage
-
-	# regex is included in glibc now, so disable buildin regex since it cause compile errors
-	mv src/gtkextext/gtkextext.h src/gtkextext/gtkextext.h.orig
-	sed -e 's/\#include "..\/regex\/regex.h"/\#include <regex.h>/' src/gtkextext/gtkextext.h.orig >src/gtkextext/gtkextext.h	
-	mv src/Makefile.am src/Makefile.am.orig
-	grep -v 'regex/libregex.a \\' src/Makefile.am.orig >src/Makefile.am.grep
-	sed -e 's/SUBDIRS \= regex gtkextext/SUBDIRS \= gtkextext/' src/Makefile.am.grep >src/Makefile.am
-	automake
-
-	./configure --disable-python --infodir=/usr/share/info --mandir=/usr/share/man --prefix=/usr --host=${CHOST} || die
-	
-	make || die
-}
-
-src_install () {
-	make prefix=${D}/usr sysconfdir=${D}/etc/gnome install || die
-	dodoc AUTHORS ABOUT-NLS ChangeLog NEWS PROPS TODO README INSTALL COPYING
-}
-
diff --git a/dev-util/gob/files/digest-gob-1.0.9 b/dev-util/gob/files/digest-gob-1.0.9
deleted file mode 100644
index 5a46a1caca54..000000000000
--- a/dev-util/gob/files/digest-gob-1.0.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c32b6af9d6d3fe0f325a10bf369365dc gob-1.0.9.tar.gz 152906
diff --git a/dev-util/gob/gob-1.0.12.ebuild b/dev-util/gob/gob-1.0.12.ebuild
index 1ac81a084754..181049f22f46 100644
--- a/dev-util/gob/gob-1.0.12.ebuild
+++ b/dev-util/gob/gob-1.0.12.ebuild
@@ -1,29 +1,26 @@
 # 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/gob/gob-1.0.12.ebuild,v 1.3 2002/06/19 23:48:46 azarah Exp $
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gob/gob-1.0.12.ebuild,v 1.4 2002/07/23 11:22:18 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="GOB is a preprocessor for making GTK+ objects with inline C code"
 SRC_URI="http://ftp.5z.com/pub/gob/${P}.tar.gz"
 HOMEPAGE="http://www.5z.com/jirka/gob.html"
+
 SLOT="1"
+LICENSE="GPL-2"
+KEYWORDS="x86"
 
 RDEPEND="=dev-libs/glib-1.2*"
-
 DEPEND="${RDEPEND}
 	sys-devel/flex"
 
 src_compile() {
-	./configure --host=${CHOST}					\
-		    --prefix=/usr					\
-		    --mandir=/usr/share/man 
-	assert
-
+	econf || die
 	make || die
 }
 
 src_install () {
 	make DESTDIR=${D} install || die
-
 	dodoc AUTHORS COPYING ChangeLog NEWS README TODO
 }
diff --git a/dev-util/gob/gob-1.0.9.ebuild b/dev-util/gob/gob-1.0.9.ebuild
deleted file mode 100644
index 9a518f01ab2a..000000000000
--- a/dev-util/gob/gob-1.0.9.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/gob/gob-1.0.9.ebuild,v 1.6 2002/07/11 06:30:25 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="GOB is a preprocessor for making GTK+ objects with inline C code"
-SRC_URI="http://ftp.5z.com/pub/gob/${P}.tar.gz"
-HOMEPAGE="http://www.5z.com/jirka/gob.html"
-SLOT="1"
-
-RDEPEND="=dev-libs/glib-1.2*"
-
-DEPEND="${RDEPEND}
-	sys-devel/flex"
-
-src_compile() {
-	./configure --host=${CHOST}					\
-		    --prefix=/usr					\
-		    --mandir=/usr/share/man 
-	assert
-
-	make || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING ChangeLog NEWS README TODO
-}
diff --git a/dev-util/gob/gob-1.99.3.ebuild b/dev-util/gob/gob-1.99.3.ebuild
index 4175b47b4ca0..d3609f411885 100644
--- a/dev-util/gob/gob-1.99.3.ebuild
+++ b/dev-util/gob/gob-1.99.3.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/gob/gob-1.99.3.ebuild,v 1.2 2002/06/19 23:48:46 azarah Exp $
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gob/gob-1.99.3.ebuild,v 1.3 2002/07/23 11:22:18 seemant Exp $
 
 
 MY_P=${PN}2-${PV}
@@ -8,7 +8,10 @@ S=${WORKDIR}/${MY_P}
 DESCRIPTION="GOB is a preprocessor for making GTK+ objects with inline C code"
 SRC_URI="http://ftp.5z.com/pub/gob/${MY_P}.tar.gz"
 HOMEPAGE="http://www.5z.com/jirka/gob.html"
+
 SLOT="2"
+LICENSE="GPL-2"
+KEYWORDS="x86"
 
 RDEPEND="=dev-libs/glib-2.0*
 	dev-libs/popt"
@@ -17,9 +20,7 @@ DEPEND="${RDEPEND}
 	sys-devel/flex"
 
 src_compile() {
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man  || die "configure fail"
+	econf  || die "configure fail"
 	emake || die
 }
 
diff --git a/dev-util/gperf/gperf-2.7.2.ebuild b/dev-util/gperf/gperf-2.7.2.ebuild
index acd3593a6776..476e08d8fe39 100644
--- a/dev-util/gperf/gperf-2.7.2.ebuild
+++ b/dev-util/gperf/gperf-2.7.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/dev-util/gperf/gperf-2.7.2.ebuild,v 1.2 2002/06/21 08:58:45 seemant Exp $
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gperf/gperf-2.7.2.ebuild,v 1.3 2002/07/23 11:22:18 seemant Exp $
 
 S=${WORKDIR}/${P}
-
 DESCRIPTION="A perfect hash function generator."
 SRC_URI="ftp://ftp.gnu.org/pub/gnu/gperf/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/gperf/gperf.html"
-DEPEND=""
 
-SLOT=""
+SLOT="0"
 LICENSE="GPL-2"
+KEYWORDS="x86"
+
+DEPEND="virtual/glibc"
 
 src_install () {
 	make DESTDIR=${D} install || die
diff --git a/dev-util/gputils/gputils-0.10.2.ebuild b/dev-util/gputils/gputils-0.10.2.ebuild
index 690ce4dd5a62..6abb557055c3 100644
--- a/dev-util/gputils/gputils-0.10.2.ebuild
+++ b/dev-util/gputils/gputils-0.10.2.ebuild
@@ -1,30 +1,26 @@
 # 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/gputils/gputils-0.10.2.ebuild,v 1.3 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/gputils/gputils-0.10.2.ebuild,v 1.4 2002/07/23 11:22:18 seemant Exp $
 
 S=${WORKDIR}/${P} 
 DESCRIPTION="Utils for the PICxxx procesors" 
 SRC_URI="mirror://sourceforge/gputils/${P}.tar.gz" 
 HOMEPAGE="http://gputils.sourceforge.net/" 
  
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
+DEPEND="virtual/glibc"
+
 src_compile(){ 
  
-         ./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc || die 
-	emake
+ 	econf || die
+	emake || die
 } 
  
 src_install() { 
-	make prefix=${D}/usr/share \
-		bindir=${D}/usr/bin \
-		confdir=${D}/etc \
-		datadir=${D}/usr/share/ \
-		mandir=${D}/usr/share/man \
-		install || die
+	einstall || die
 	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
 	dodoc doc/gputils.ps
 }
diff --git a/dev-util/gtk-doc/gtk-doc-0.9-r2.ebuild b/dev-util/gtk-doc/gtk-doc-0.9-r2.ebuild
index faba99d19772..97c86d286a2b 100644
--- a/dev-util/gtk-doc/gtk-doc-0.9-r2.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-0.9-r2.ebuild
@@ -1,18 +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/dev-util/gtk-doc/gtk-doc-0.9-r2.ebuild,v 1.4 2002/07/11 06:30:25 drobbins Exp $
-
-# ACONFVER=2.52f
-# AMAKEVER=1.5b
-# inherit autotools 
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/gtk-doc-0.9-r2.ebuild,v 1.5 2002/07/23 11:22:18 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="GTK+ Documentation Generator"
 SRC_URI="ftp://ftp.gnome.org/pub/gnome/pre-gnome2/sources/gtk-doc/${P}.tar.gz"
 HOMEPAGE="http://www.gtk.org/"
 
-DEPEND="virtual/glibc
-	>=dev-util/pkgconfig-0.12.0
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
+DEPEND=">=dev-util/pkgconfig-0.12.0
 	>=app-text/openjade-1.3
 	>=app-text/docbook-sgml-dtd-4.1
 	>=app-text/sgml-common-0.6.1
@@ -20,29 +19,15 @@ DEPEND="virtual/glibc
 	>=sys-devel/perl-5.0.0"
 		
 src_compile() {
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--enable-debug=yes || die
+	econf --enable-debug=yes || die
 	emake || die
 }
 
 src_install() {
-	make prefix=${D}/usr \
-		sysconfdir=${D}/etc \
-		infodir=${D}/usr/share/info \
-		mandir=${D}/usr/share/man \
-		install || die
+	einstall || die
 	
 	dodoc AUTHORS ChangeLog COPYING INSTALL README* NEWS 
 	docinto doc
 	dodoc doc/README doc/*.txt
 	
 }
-
-
-
-
-
diff --git a/dev-util/guile/files/digest-guile-1.4-r3 b/dev-util/guile/files/digest-guile-1.4-r3
deleted file mode 100644
index 5fdf378914d1..000000000000
--- a/dev-util/guile/files/digest-guile-1.4-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 60430592385b96319ea3eb4cba88062c guile-1.4.tar.gz 1132852
diff --git a/dev-util/guile/guile-1.4-r3.ebuild b/dev-util/guile/guile-1.4-r3.ebuild
deleted file mode 100644
index fd365d03d7d5..000000000000
--- a/dev-util/guile/guile-1.4-r3.ebuild
+++ /dev/null
@@ -1,39 +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/guile/guile-1.4-r3.ebuild,v 1.4 2002/07/11 06:30:25 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Guile is an interpreter for Scheme"
-SRC_URI="ftp://prep.ai.mit.edu/gnu/guile/${P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/guile/"
-
-DEPEND="virtual/glibc
-	>=sys-libs/ncurses-5.1
-        >=sys-libs/readline-4.1"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	cp  ${FILESDIR}/net_db.c libguile/
-}
-
-src_compile() {                           
-	cd ${S}
-	./configure --host=${CHOST}					\
-		    --prefix=/usr					\
-		    --infodir=/usr/share/info				\
-		    --with-threads					\
-		    --with-modules
-	assert
-
-	make || die
-}
-
-src_install() {
-	make prefix=${D}/usr						\
-	     infodir=${D}/usr/share/info				\
-	     install || die
-
-	dodoc AUTHORS COPYING ChangeLog GUILE-VERSION HACKING NEWS 
-	dodoc README SNAPSHOTS THANKS
-}
diff --git a/dev-util/guile/guile-1.5.4.ebuild b/dev-util/guile/guile-1.5.4.ebuild
index 25498c862e1a..985ad0b0767d 100644
--- a/dev-util/guile/guile-1.5.4.ebuild
+++ b/dev-util/guile/guile-1.5.4.ebuild
@@ -1,39 +1,31 @@
-# 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/guile/guile-1.5.4.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/guile/guile-1.5.4.ebuild,v 1.3 2002/07/23 11:22:18 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Guile is an interpreter for Scheme"
 SRC_URI="ftp://alpha.gnu.org/gnu/guile/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/guile/"
 
-DEPEND="virtual/glibc
-	>=sys-libs/ncurses-5.1
-        >=sys-libs/readline-4.1"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
 
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-#	cp  ${FILESDIR}/net_db.c libguile/
-}
+DEPEND=">=sys-libs/ncurses-5.1
+	>=sys-libs/readline-4.1"
 
 src_compile() {
 
-	./configure --prefix=/usr					\
-		    --infodir=/usr/share/info				\
-		    --with-threads					\
-		    --with-modules || die
+	econf \
+		--with-threads \
+		--with-modules || die
 
 	emake || die
 }
 
 src_install() {
 
-	make prefix=${D}/usr						\
-	     infodir=${D}/usr/share/info				\
-	     install || die
+	einstall || die
 
 	dodoc AUTHORS COPYING ChangeLog GUILE-VERSION HACKING NEWS 
 	dodoc README SNAPSHOTS THANKS
diff --git a/dev-util/huc/huc-0.1.ebuild b/dev-util/huc/huc-0.1.ebuild
index 883245eb8e5a..25eafe897062 100644
--- a/dev-util/huc/huc-0.1.ebuild
+++ b/dev-util/huc/huc-0.1.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/dev-util/huc/huc-0.1.ebuild,v 1.3 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/huc/huc-0.1.ebuild,v 1.4 2002/07/23 11:22:18 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="HTML umlaut conversion tool"
-SRC_URI="http://www.int21.de/huc/huc-0.1.tar.bz2"
+SRC_URI="http://www.int21.de/huc/${P}.tar.bz2"
 HOMEPAGE="http://www.int21.de/huc/"
-DEPEND=""
-LICENCE="GPL"
+
 SLOT="0"
-RDEPEND=""
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
+DEPEND="virtual/glibc"
 
 src_compile() 
 {
@@ -21,4 +23,3 @@ src_install ()
 	dobin huc
 	dodoc README COPYING
 }
-			
diff --git a/dev-util/indent/indent-2.2.6.ebuild b/dev-util/indent/indent-2.2.6.ebuild
index bd8c09d6a6fe..258c4d3823fa 100644
--- a/dev-util/indent/indent-2.2.6.ebuild
+++ b/dev-util/indent/indent-2.2.6.ebuild
@@ -1,30 +1,24 @@
-# 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/indent/indent-2.2.6.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/indent/indent-2.2.6.ebuild,v 1.3 2002/07/23 11:22:18 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Indent program source files"
 SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
 DEPEND="virtual/glibc"
 
 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 \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
-
+	einstall || die
 	dodoc AUTHORS COPYING NEWS README* 
 }
diff --git a/dev-util/insight/insight-5.1.1.ebuild b/dev-util/insight/insight-5.1.1.ebuild
index a044b11d1f31..b449b92e73c3 100644
--- a/dev-util/insight/insight-5.1.1.ebuild
+++ b/dev-util/insight/insight-5.1.1.ebuild
@@ -1,36 +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/insight/insight-5.1.1.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/insight/insight-5.1.1.ebuild,v 1.3 2002/07/23 11:22:19 seemant Exp $
 
+S=${WORKDIR}/${P}
 DESCRIPTION="A graphical interface to the GNU debugger"
 HOMEPAGE="http://sources.redhat.com/insight/index.html"
-
 SRC_URI="ftp://sources.redhat.com/pub/gdb/releases/${P}.tar.bz2"
-S="${WORKDIR}/${P}"
 
-DEPEND="virtual/glibc
-        sys-libs/ncurses
-        nls? ( sys-devel/gettext )"
+SLOT="0"
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS="x86"
+
+DEPEND="sys-libs/ncurses"
+RDEPEND="${DEPEND}
+	nls? ( sys-devel/gettext )"
 
 INSIGHTDIR="/opt/insight"
 
 src_compile() {
-    local myconf
-    if [ -z "`use nls`" ]; then
-	myconf="--disable-nls"
-    fi
-    ./configure \
-	--host="${CHOST}" \
-	--prefix="${INSIGHTDIR}" \
-	--without-included-regex \
-	--without-included-gettext \
-	${myconf} || die
-    emake || die
+	local myconf
+	use nls || myconf="--disable-nls"
+
+	econf ${myconf} || die
+	emake || die
 }
 
 src_install () {
-    make prefix="${D}${INSIGHTDIR}" install || die
-    dosym /opt/insight/bin/gdb /opt/insight/bin/insight
-    insinto /etc/env.d
-    doins "${FILESDIR}/99insight"
+	make prefix="${D}${INSIGHTDIR}" install || die
+	dosym /opt/insight/bin/gdb /opt/insight/bin/insight
+	insinto /etc/env.d
+	doins "${FILESDIR}/99insight"
 }
diff --git a/dev-util/intltool/files/digest-intltool-0.19 b/dev-util/intltool/files/digest-intltool-0.19
deleted file mode 100644
index bec9ac3bed5d..000000000000
--- a/dev-util/intltool/files/digest-intltool-0.19
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bbdb3cb44af0a5c316654a9a7363e4c2 intltool-0.19.tar.bz2 86019
diff --git a/dev-util/intltool/files/digest-intltool-0.21 b/dev-util/intltool/files/digest-intltool-0.21
deleted file mode 100644
index 79bbe5602653..000000000000
--- a/dev-util/intltool/files/digest-intltool-0.21
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4f054b517fbe888439f4a3906177aacf intltool-0.21.tar.bz2 88531
diff --git a/dev-util/intltool/intltool-0.19.ebuild b/dev-util/intltool/intltool-0.19.ebuild
deleted file mode 100644
index d6a773ee44fe..000000000000
--- a/dev-util/intltool/intltool-0.19.ebuild
+++ /dev/null
@@ -1,32 +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/intltool/intltool-0.19.ebuild,v 1.2 2002/07/11 06:30:25 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Scripts for extracting translatable strings from various sourcefiles"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.gnome.org/"
-
-DEPEND="virtual/glibc
-	>=dev-libs/popt-1.5
-	>=sys-devel/perl-5.6.0"
-
-src_compile() {                           
-	./configure --host=${CHOST}	\
-		    --prefix=/usr		\
-		    --sysconfdir=/etc	\
-		    --localstatedir=/var/lib \
-		    --mandir=/usr/share/man || die
-	emake || die
-}
-
-src_install() {
-	make prefix=${D}/usr	\
-	     sysconfdir=${D}/etc \
-	     localstatedir=${D}/var/lib	\
-	     mandir=${D}/usr/share/man \
-	     install || die
-
-	dodoc AUTHORS ChangeLog NEWS README
-}
-
diff --git a/dev-util/intltool/intltool-0.21.ebuild b/dev-util/intltool/intltool-0.21.ebuild
deleted file mode 100644
index 3117a5a67808..000000000000
--- a/dev-util/intltool/intltool-0.21.ebuild
+++ /dev/null
@@ -1,32 +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/intltool/intltool-0.21.ebuild,v 1.2 2002/07/11 06:30:25 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Scripts for extracting translatable strings from various sourcefiles"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.gnome.org/"
-
-DEPEND="virtual/glibc
-	>=dev-libs/popt-1.5
-	>=sys-devel/perl-5.6.0"
-
-src_compile() {                           
-	./configure --host=${CHOST}	\
-		    --prefix=/usr		\
-		    --sysconfdir=/etc	\
-		    --localstatedir=/var/lib \
-		    --mandir=/usr/share/man || die
-	emake || die
-}
-
-src_install() {
-	make prefix=${D}/usr	\
-	     sysconfdir=${D}/etc \
-	     localstatedir=${D}/var/lib	\
-	     mandir=${D}/usr/share/man \
-	     install || die
-
-	dodoc AUTHORS ChangeLog NEWS README
-}
-
diff --git a/dev-util/intltool/intltool-0.22.ebuild b/dev-util/intltool/intltool-0.22.ebuild
index f8a343a2d51d..54e59f0069b5 100644
--- a/dev-util/intltool/intltool-0.22.ebuild
+++ b/dev-util/intltool/intltool-0.22.ebuild
@@ -1,21 +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/dev-util/intltool/intltool-0.22.ebuild,v 1.1 2002/06/06 23:29:54 spider Exp $
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/intltool/intltool-0.22.ebuild,v 1.2 2002/07/23 11:22:19 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Scripts for extracting translatable strings from various sourcefiles"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.bz2"
 HOMEPAGE="http://www.gnome.org/"
+SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.bz2"
+
 SLOT="0"
 LICENSE="GPL-2"
+KEYWORDS="x86"
 
-
-DEPEND="virtual/glibc
-	>=dev-libs/popt-1.5
+DEPEND=">=dev-libs/popt-1.5
 	>=sys-devel/perl-5.6.0"
 
-RDEPEND=$DEPEND
-
 src_compile() {                           
 	econf || die "configure flawed" 
 	emake || die "compile flawed" 
@@ -25,4 +23,3 @@ src_install() {
 	einstall || die "installation failed"
 	dodoc AUTHORS ChangeLog NEWS README
 }
-
diff --git a/dev-util/kconfigure/kconfigure-1.1.ebuild b/dev-util/kconfigure/kconfigure-1.1.ebuild
index dfa4a6ef5717..3110f4f4dbd4 100644
--- a/dev-util/kconfigure/kconfigure-1.1.ebuild
+++ b/dev-util/kconfigure/kconfigure-1.1.ebuild
@@ -1,12 +1,15 @@
-# 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/kconfigure/kconfigure-1.1.ebuild,v 1.2 2002/05/21 18:14:08 danarmak 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/kconfigure/kconfigure-1.1.ebuild,v 1.3 2002/07/23 11:22:19 seemant Exp $
 
 inherit kde-base
 
 need-kde 2
 
 DESCRIPTION="A GUI frontend for kde-style configure/make/make install packages"
-SRC_URI="http://unc.dl.sourceforge.net/${PN}/${P}.tar.gz
-	 http://telia.dl.sourceforge.net/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://${PN}.sourceforge.net"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
diff --git a/dev-util/kdbg/files/digest-kdbg-1.2.5.2 b/dev-util/kdbg/files/digest-kdbg-1.2.5.2
deleted file mode 100644
index 5ebc60d8ba61..000000000000
--- a/dev-util/kdbg/files/digest-kdbg-1.2.5.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5a472882b1fa28c2e82e51be9b364c62 kdbg-1.2.5.tar.gz 450958
diff --git a/dev-util/kdbg/kdbg-1.2.5.2.ebuild b/dev-util/kdbg/kdbg-1.2.5.2.ebuild
deleted file mode 100644
index 8ddf0c006119..000000000000
--- a/dev-util/kdbg/kdbg-1.2.5.2.ebuild
+++ /dev/null
@@ -1,21 +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/kdbg/kdbg-1.2.5.2.ebuild,v 1.6 2002/05/27 17:27:38 drobbins Exp $
-
-# 1.2.5 version links against KDE2
-MY_PV=1.2.5
-MY_P=${PN}-${MY_PV}
-
- 
-inherit kde-base
-
-need-kde 2
-
-DESCRIPTION="A Graphical Debugger Interface to gdb"
-SRC_URI="mirror://sourceforge/kdbg/kdbg-1.2.5.tar.gz"
-HOMEPAGE="http://members.nextra.at/johsixt/kdbg.html"
-S=${WORKDIR}/${MY_P}
-
-myconf="$myconf --with-kde-version=2"
-
-RDEPEND=">=sys-devel/gdb-5.0"
diff --git a/dev-util/kdbg/kdbg-1.2.5.3.ebuild b/dev-util/kdbg/kdbg-1.2.5.3.ebuild
index 2de003c214f2..ced636825a50 100644
--- a/dev-util/kdbg/kdbg-1.2.5.3.ebuild
+++ b/dev-util/kdbg/kdbg-1.2.5.3.ebuild
@@ -1,23 +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/kdbg/kdbg-1.2.5.3.ebuild,v 1.6 2002/05/27 17:27:38 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/kdbg/kdbg-1.2.5.3.ebuild,v 1.7 2002/07/23 11:22:19 seemant Exp $
 
 # 1.2.5 version links against KDE3
 MY_PV=1.2.5
 MY_P=${PN}-${MY_PV}
 
- 
 inherit kde-base
 
 need-kde 3
 
+S=${WORKDIR}/${MY_P}
 DESCRIPTION="A Graphical Debugger Interface to gdb"
 SRC_URI="mirror://sourceforge/kdbg/${MY_P}.tar.gz"
 HOMEPAGE="http://members.nextra.at/johsixt/kdbg.html"
-S=${WORKDIR}/${MY_P}
 
-myconf="$myconf --with-kde-version=3"
+myconf="${myconf} --with-kde-version=3"
 
 export LIBQTMT="-lqt-mt"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
 RDEPEND=">=sys-devel/gdb-5.0"
diff --git a/dev-util/kdestudio/kdestudio-2.0.0-r2.ebuild b/dev-util/kdestudio/kdestudio-2.0.0-r2.ebuild
index 32006f0d13e9..d3dc3dfab12a 100644
--- a/dev-util/kdestudio/kdestudio-2.0.0-r2.ebuild
+++ b/dev-util/kdestudio/kdestudio-2.0.0-r2.ebuild
@@ -1,13 +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/kdestudio/kdestudio-2.0.0-r2.ebuild,v 1.3 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/kdestudio/kdestudio-2.0.0-r2.ebuild,v 1.4 2002/07/23 11:22:19 seemant Exp $
 
 inherit kde-base
 
 HOMEPAGE="http://www.thekompany.com/projects/kdestudio"
 DESCRIPTION="KDE 2.x IDE"
-
 SRC_URI="ftp://ftp.rygannon.com/pub/KDE_Studio/source/${P}.tar.gz"
 
 need-kde 2.1
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
diff --git a/dev-util/kdevelop/kdevelop-2.1.2.ebuild b/dev-util/kdevelop/kdevelop-2.1.2.ebuild
index b50180224c03..fa9cb949de1f 100644
--- a/dev-util/kdevelop/kdevelop-2.1.2.ebuild
+++ b/dev-util/kdevelop/kdevelop-2.1.2.ebuild
@@ -1,21 +1,24 @@
-# 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/kdevelop/kdevelop-2.1.2.ebuild,v 1.5 2002/07/21 15:29:01 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/kdevelop/kdevelop-2.1.2.ebuild,v 1.6 2002/07/23 11:22:19 seemant Exp $
 
 inherit kde-base
 need-kde 3
 
 S=${WORKDIR}/${P}_for_KDE_3.0
-
 DESCRIPTION="KDevelop ${PV}"
 HOMEPAGE="www.kdevelop.org"
-
 SRC_PATH="kde/stable/3.0.2/src/${P}_for_KDE_3.0.tar.bz2"
 SRC_URI="ftp://ftp.kde.org/pub/$SRC_PATH
-	 ftp://ftp.fh-heilbronn.de/pub/mirrors/$SRC_PATH
-	 ftp://ftp.sourceforge.net/pub/mirrors/$SRC_PATH
-	 mirror://gentoo/c_cpp_reference-1.0.tar.gz
-	 mirror://gentoo/kdelibs-kdevelop-docs-3.0.1.tar.bz2"
+	ftp://ftp.fh-heilbronn.de/pub/mirrors/$SRC_PATH
+	ftp://ftp.sourceforge.net/pub/mirrors/$SRC_PATH
+	mirror://gentoo/c_cpp_reference-1.0.tar.gz
+	mirror://gentoo/kdelibs-kdevelop-docs-3.0.1.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
 
 DEPEND="$DEPEND
 	sys-devel/flex
diff --git a/dev-util/kdoc/kdoc-2.0_alpha54.ebuild b/dev-util/kdoc/kdoc-2.0_alpha54.ebuild
index 3344da11a6b6..a5d954849e4e 100644
--- a/dev-util/kdoc/kdoc-2.0_alpha54.ebuild
+++ b/dev-util/kdoc/kdoc-2.0_alpha54.ebuild
@@ -1,11 +1,12 @@
-# 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/kdoc/kdoc-2.0_alpha54.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/kdoc/kdoc-2.0_alpha54.ebuild,v 1.3 2002/07/23 11:22:19 seemant Exp $
 
+MY_P=${P/_alph/}
+S=${WORKDIR}/${MY_P}
 DESCRIPTION="KDE/QT documentation processing/generation tools"
 HOMEPAGE="http://www.ph.unimelb.edu.au/~ssk/kde/kdoc/"
-
-SRC_PATH="kde/stable/3.0/src/kdoc-2.0a54.tar.bz2"
+SRC_PATH="kde/stable/3.0/src/${MY_P}.tar.bz2"
 SRC_URI="ftp://ftp.kde.org/pub/$SRC_PATH
 	ftp://download.us.kde.org/pub/kde/$SRC_PATH
 	ftp://download.uk.kde.org/pub/kde/$SRC_PATH
@@ -13,9 +14,11 @@ SRC_URI="ftp://ftp.kde.org/pub/$SRC_PATH
 	ftp://download.at.kde.org/pub/kde/$SRC_PATH
 	ftp://ftp.sourceforge.net/pub/mirrors/$SRC_PATH"
 
-S=${WORKDIR}/kdoc-2.0a54
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
 
-DEPEND="sys-devel/perl sys-devel/gcc"
+DEPEND="sys-devel/perl"
 
 src_compile() {