repoman'd

70 files changed, 237 insertions, 1396 deletions

diff --git a/media-gfx/autotrace/autotrace-0.26-r1.ebuild b/media-gfx/autotrace/autotrace-0.26-r1.ebuild
deleted file mode 100644
index a9bcbf65caf1..000000000000
--- a/media-gfx/autotrace/autotrace-0.26-r1.ebuild
+++ /dev/null
@@ -1,29 +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/media-gfx/autotrace/autotrace-0.26-r1.ebuild,v 1.4 2002/07/11 06:30:27 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Converts Bitmaps to vector-grahics"
-SRC_URI="http://homepages.go.com/homepages/m/a/r/martweb/${P}.tar.gz"
-HOMEPAGE="http://homepages.go.com/homepages/m/a/r/martweb/AutoTrace.htm"
-
-DEPEND="virtual/glibc
-	>=x11-libs/gtkDPS-0.3.3
-	=x11-libs/gtk+-1.2*"
-
-
-src_compile() {
-
-	./configure --prefix=/usr || die
-	#	cp Makefile Makefile.orig
-	#	sed -e "s:\$(LINK):\$(LINK) -lXt:" Makefile.orig > Makefile
-	make || die
-
-}
-
-src_install () {
-
-	cd ${S}
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS COPYING ChangeLog NEWS README 
-}
diff --git a/media-gfx/autotrace/autotrace-0.27a.ebuild b/media-gfx/autotrace/autotrace-0.27a.ebuild
deleted file mode 100644
index 7c7c61adeb34..000000000000
--- a/media-gfx/autotrace/autotrace-0.27a.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/media-gfx/autotrace/autotrace-0.27a.ebuild,v 1.5 2002/07/11 06:30:27 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Converts Bitmaps to vector-grahics"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://autotrace.sourceforge.net/"
-
-DEPEND="virtual/glibc
-	>=x11-libs/gtkDPS-0.3.3
-	=x11-libs/gtk+-1.2*"
-
-
-src_compile() {
-
-	./configure --host=${CHOST} \
-		--prefix=/usr || die
-		    
-	#	cp Makefile Makefile.orig
-	#	sed -e "s:\$(LINK):\$(LINK) -lXt:" Makefile.orig > Makefile
-
-	make || die
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-	
-	dodoc AUTHORS COPYING ChangeLog NEWS README 
-}
-
diff --git a/media-gfx/autotrace/autotrace-0.30.ebuild b/media-gfx/autotrace/autotrace-0.30.ebuild
index b13673d181fc..da04141a1292 100644
--- a/media-gfx/autotrace/autotrace-0.30.ebuild
+++ b/media-gfx/autotrace/autotrace-0.30.ebuild
@@ -1,24 +1,24 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/autotrace/autotrace-0.30.ebuild,v 1.2 2002/07/11 06:30:27 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/autotrace/autotrace-0.30.ebuild,v 1.3 2002/07/23 04:33:46 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Converts Bitmaps to vector-grahics"
 SRC_URI="http://ftp1.sourceforge.net/${PN}/${P}.tar.gz"
 HOMEPAGE="http://autotrace.sourceforge.net/"
 
-DEPEND="virtual/glibc
-	>=x11-libs/gtkDPS-0.3.3
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
+DEPEND=">=x11-libs/gtkDPS-0.3.3
 	>=x11-libs/gtk+-1.2.10-r4"
-RDEPEND=${DEPEND}
 
-LICENSE="GPL-2"
+RDEPEND=${DEPEND}
 
 src_compile() {
 
-	./configure --host=${CHOST} \
-		--prefix=/usr || die
-		    
+	econf || die
 	emake || die
 }
 
@@ -28,4 +28,3 @@ src_install() {
 	
 	dodoc AUTHORS COPYING ChangeLog NEWS README 
 }
-
diff --git a/media-gfx/autotrace/files/digest-autotrace-0.26-r1 b/media-gfx/autotrace/files/digest-autotrace-0.26-r1
deleted file mode 100644
index 7bc6eafd8728..000000000000
--- a/media-gfx/autotrace/files/digest-autotrace-0.26-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3b4dd2f63840642aad6110aa80ac299d autotrace-0.26.tar.gz 119613
diff --git a/media-gfx/autotrace/files/digest-autotrace-0.27a b/media-gfx/autotrace/files/digest-autotrace-0.27a
deleted file mode 100644
index 8e8acd747f0d..000000000000
--- a/media-gfx/autotrace/files/digest-autotrace-0.27a
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cb656a5d76170ab64d95ed81642d0233 autotrace-0.27a.tar.gz 205988
diff --git a/media-gfx/aview/aview-1.3.0_rc1.ebuild b/media-gfx/aview/aview-1.3.0_rc1.ebuild
index 1e5dc8f19280..88d485e2c863 100644
--- a/media-gfx/aview/aview-1.3.0_rc1.ebuild
+++ b/media-gfx/aview/aview-1.3.0_rc1.ebuild
@@ -1,19 +1,22 @@
-# 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/media-gfx/aview/aview-1.3.0_rc1.ebuild,v 1.3 2002/07/11 06:30:27 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/aview/aview-1.3.0_rc1.ebuild,v 1.4 2002/07/23 04:33:46 seemant Exp $
 
-MY_P="`echo ${P} |sed -e 's:_::'`"
-S="${WORKDIR}/`echo ${MY_P} |sed -e 's:rc.::'`"
+MY_P=${P/_/}
+S=${WORKDIR}/${MY_P/rc./}
 DESCRIPTION="An ASCII PNG-Viewer"
 SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz"
 HOMEPAGE="http://aa-project.sourceforge.net/aview/" 
 
-DEPEND=">=media-libs/aalib-1.4_rc4"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
 
+DEPEND=">=media-libs/aalib-1.4_rc4"
 
 src_compile() {
 
-	./configure --prefix=/usr --host=${CHOST} || die
+	econf || die
 	make aview || die
 }
 
@@ -25,5 +28,3 @@ src_install() {
 	doman *.1 
 	dodoc ANNOUNCE COPYING ChangeLog README* TODO
 }
-
-
diff --git a/media-gfx/blender/blender-2.23.ebuild b/media-gfx/blender/blender-2.23.ebuild
index 4b7b9b4642d8..b1167706b089 100644
--- a/media-gfx/blender/blender-2.23.ebuild
+++ b/media-gfx/blender/blender-2.23.ebuild
@@ -1,12 +1,16 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.23.ebuild,v 1.1 2002/06/16 00:16:11 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.23.ebuild,v 1.2 2002/07/23 04:33:46 seemant Exp $
 
 S=${WORKDIR}/blender-creator-${PV}-linux-glibc2.1.2-i386
 DESCRIPTION="Extremely fast and versatile 3D rendering package"
 SRC_URI="http://www.download.blender.pl/mirror/blender-creator-${PV}-linux-glibc2.1.2-i386.tar.gz http://www.download.blender.pl/mirror/manual_1.5.zip"
 HOMEPAGE="http://www.blender.nl"
 
+SLOT="0"
+LICENSE="blender"
+KEYWORDS="x86"
+
 DEPEND="app-arch/unzip"
 RDEPEND="virtual/x11"
 
@@ -24,4 +28,6 @@ src_install () {
 	newins ${FILESDIR}/${P} blender
 	dodir /usr/bin
 	dosym /opt/blender-${PV}/blender /usr/bin/blender
+
+	dodoc README
 }
diff --git a/media-gfx/ee/ee-0.3.12-r1.ebuild b/media-gfx/ee/ee-0.3.12-r1.ebuild
deleted file mode 100644
index 8999d5357631..000000000000
--- a/media-gfx/ee/ee-0.3.12-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-S=${WORKDIR}/${P}
-DESCRIPTION="ee"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.gnome.org/"
-
-DEPEND=">=gnome-base/gnome-libs-1.4.1.2-r1"
-
-
-src_compile() {
-
-	./configure --host=${CHOST}					\
-		    --prefix=/usr || die
-
-	emake || die
-}
-
-src_install() {
-
-	# .mo-files doesn't work with DESTDIR, *grr*
-	make DESTDIR=${D} 						\
-	     prefix=${D}/usr						\
-	     install || die
-
-	dodoc AUTHORS COPYING ChangeLog NEWS README
-}
diff --git a/media-gfx/ee/ee-0.3.12-r2.ebuild b/media-gfx/ee/ee-0.3.12-r2.ebuild
index ccf81c240057..a156bc95de4f 100644
--- a/media-gfx/ee/ee-0.3.12-r2.ebuild
+++ b/media-gfx/ee/ee-0.3.12-r2.ebuild
@@ -1,16 +1,19 @@
-# 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/media-gfx/ee/ee-0.3.12-r2.ebuild,v 1.3 2002/07/23 04:33:46 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="ee"
 SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.gnome.org/"
 
-DEPEND=">=gnome-base/gnome-libs-1.4.1.2-r1
-	nls? ( sys-devel/gettext )"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
 
+DEPEND=">=gnome-base/gnome-libs-1.4.1.2-r1"
+RDEPEND="nls? ( sys-devel/gettext )"
 
-RDEPEND=$DEPEND
 src_unpack() {
 	unpack ${A}
 	cd ${S}
diff --git a/media-gfx/ee/files/digest-ee-0.3.12-r1 b/media-gfx/ee/files/digest-ee-0.3.12-r1
deleted file mode 100644
index d3e5639d89ea..000000000000
--- a/media-gfx/ee/files/digest-ee-0.3.12-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d7e92c1cc560ce76e439353462b8aa7e ee-0.3.12.tar.gz 437916
diff --git a/media-gfx/eog/eog-0.6-r3.ebuild b/media-gfx/eog/eog-0.6-r3.ebuild
deleted file mode 100644
index 297d122f2431..000000000000
--- a/media-gfx/eog/eog-0.6-r3.ebuild
+++ /dev/null
@@ -1,56 +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/media-gfx/eog/eog-0.6-r3.ebuild,v 1.3 2002/07/11 06:30:27 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Eye of GNOME"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/eog/${P}.tar.gz"
-HOMEPAGE="http://www.gnome.org/gnome-office/eog.shtml"
-
-RDEPEND="virtual/glibc
-	>=gnome-base/gconf-1.0.4-r2
-	>=gnome-base/bonobo-1.0.9-r1
-	>=gnome-base/gnome-print-0.25i
-	>=gnome-base/libglade-0.17
-	>=gnome-base/oaf-0.6.2
-	=dev-libs/glib-1.2*
-	>=media-libs/gdk-pixbuf-0.16.0
-	jpeg? ( media-libs/jpeg )
-	png? ( 	media-libs/libpng 
-			sys-libs/zlib )"
-
-DEPEND="${RDEPEND}
-	virtual/glibc
-	nls? ( sys-devel/gettext )
-	>=dev-util/intltool-0.11"
-
-
-src_compile() {
-
-	local myconf
-
-	if [ -z "`use nls`" ] ; then
-		myconf="--disable-nls"
-	fi
-
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var/lib \
-		${myconf} || die
-	
-	emake || die
-}
-
-src_install() {
-
-	make prefix=${D}/usr \
-		sysconfdir=${D}/etc \
-		localstatedir=/var/lib \
-		GCONF_CONFIG_SOURCE="xml::${D}/etc/gconf/gconf.xml.defaults" \
-		install || die
-
-	dodoc AUTHORS COPYING DEPENDS ChangeLog HACKING NEWS README \
-		TODO MAINTAINERS
-}
-
diff --git a/media-gfx/eog/eog-0.6-r4.ebuild b/media-gfx/eog/eog-0.6-r4.ebuild
index b147bbca9eb7..65ed08cd0be7 100644
--- a/media-gfx/eog/eog-0.6-r4.ebuild
+++ b/media-gfx/eog/eog-0.6-r4.ebuild
@@ -1,14 +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/media-gfx/eog/eog-0.6-r4.ebuild,v 1.3 2002/07/11 06:30:27 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-0.6-r4.ebuild,v 1.4 2002/07/23 04:33:46 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Eye of GNOME"
 SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/eog/${P}.tar.gz"
 HOMEPAGE="http://www.gnome.org/gnome-office/eog.shtml"
 
-RDEPEND="virtual/glibc
-	>=gnome-base/gconf-1.0.4-r2
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
+DEPEND=">=gnome-base/gconf-1.0.4-r2
 	>=gnome-base/bonobo-1.0.9-r1
 	>=gnome-base/gnome-print-0.25i
 	>=gnome-base/libglade-0.17
@@ -19,7 +22,7 @@ RDEPEND="virtual/glibc
 	png? ( 	media-libs/libpng 
 			sys-libs/zlib )"
 
-DEPEND="${RDEPEND}
+RDEPEND="${DEPEND}
 	nls? ( sys-devel/gettext
 	>=dev-util/intltool-0.11 )"
 
@@ -30,12 +33,7 @@ src_compile() {
 
 	use nls || myconf="--disable-nls"
 
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var/lib \
-		${myconf} || die
-	
+	econf ${myconf} || die
 	emake || die
 }
 
diff --git a/media-gfx/eog/eog-1.0.0.ebuild b/media-gfx/eog/eog-1.0.0.ebuild
deleted file mode 100644
index e721faf7ddab..000000000000
--- a/media-gfx/eog/eog-1.0.0.ebuild
+++ /dev/null
@@ -1,35 +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/media-gfx/eog/eog-1.0.0.ebuild,v 1.1 2002/06/10 21:18:57 spider Exp $
-
- 
-inherit gnome2
-
-S=${WORKDIR}/${P}
-DESCRIPTION="the Eye Of Gnome - Image Viewer and Cataloger for Gnome2"
-SRC_URI="ftp://ftp.gnome.org/pub/gnome/pre-gnome2/sources/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.gnome.org/"
-SLOT="1"
-LICENSE="GPL-2"
-
-RDEPEND=">=dev-libs/glib-2.0.0
-	>=gnome-base/gconf-1.1.8
-	>=x11-libs/gtk+-2.0.0
-	>=dev-libs/libxml2-2.4.17
-	>=gnome-base/gnome-vfs-1.9.16
-	>=gnome-base/libgnomeui-2.0.0
-	>=gnome-base/libbonoboui-2.0.0
-	>=gnome-base/bonobo-activation-1.0.0
-	>=gnome-base/libgnomecanvas-2.0.0
-	>=gnome-base/libgnomeprint-1.115.0
-	>=sys-libs/zlib-1.1.4
-	>=media-libs/libpng-1.2.1"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.17"
-
-G2CONF="${G2CONF} --enable-platform-gnome-2"
-DOCS="AUTHORS ChangeLog COPYING README* INSTALL NEWS HACKING  DEPENDS THANKS  TODO"
-SCHEMAS="eog.schemas"
-
diff --git a/media-gfx/eog/eog-1.0.1-r1.ebuild b/media-gfx/eog/eog-1.0.1-r1.ebuild
deleted file mode 100644
index 83afc7bc700a..000000000000
--- a/media-gfx/eog/eog-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,36 +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/media-gfx/eog/eog-1.0.1-r1.ebuild,v 1.1 2002/06/21 14:06:16 spider Exp $
-
- 
-inherit gnome2
-
-S=${WORKDIR}/${P}
-DESCRIPTION="the Eye Of Gnome - Image Viewer and Cataloger for Gnome2"
-SRC_URI="ftp://ftp.gnome.org/pub/gnome/pre-gnome2/sources/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.gnome.org/"
-SLOT="1"
-LICENSE="GPL-2"
-
-RDEPEND=">=dev-libs/glib-2.0.3
-	>=gnome-base/gconf-1.2.0
-	>=x11-libs/gtk+-2.0.5
-	>=dev-libs/libxml2-2.4.17
-	>=gnome-base/gnome-vfs-2.0.0
-	>=gnome-base/libgnomeui-2.0.1
-	>=gnome-base/libbonoboui-2.0.0
-	>=gnome-base/bonobo-activation-1.0.1
-	>=gnome-base/libgnomecanvas-2.0.1
-	>=gnome-base/libgnomeprint-1.115.0
-	>=gnome-base/librsvg-2.0.0
-	>=sys-libs/zlib-1.1.4
-	>=media-libs/libpng-1.2.1"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.17"
-
-G2CONF="${G2CONF} --enable-platform-gnome-2"
-DOCS="AUTHORS ChangeLog COPYING README* INSTALL NEWS HACKING  DEPENDS THANKS  TODO"
-SCHEMAS="eog.schemas"
-
diff --git a/media-gfx/eog/eog-1.0.1-r2.ebuild b/media-gfx/eog/eog-1.0.1-r2.ebuild
index 967deb4f4acf..aa12dbdaba0c 100644
--- a/media-gfx/eog/eog-1.0.1-r2.ebuild
+++ b/media-gfx/eog/eog-1.0.1-r2.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/media-gfx/eog/eog-1.0.1-r2.ebuild,v 1.1 2002/06/26 23:18:01 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-1.0.1-r2.ebuild,v 1.2 2002/07/23 04:33:46 seemant Exp $
 
- 
 inherit gnome2
 
 S=${WORKDIR}/${P}
 DESCRIPTION="the Eye Of Gnome - Image Viewer and Cataloger for Gnome2"
 SRC_URI="mirror://gnome/sources/${PN}/${P}.tar.bz2"
 HOMEPAGE="http://www.gnome.org/"
+
 SLOT="1"
 LICENSE="GPL-2"
+KEYWORDS="x86"
 
 RDEPEND=">=dev-libs/glib-2.0.3
 	>=gnome-base/gconf-1.2.0
diff --git a/media-gfx/eog/files/digest-eog-0.6-r3 b/media-gfx/eog/files/digest-eog-0.6-r3
deleted file mode 100644
index 941eb438c206..000000000000
--- a/media-gfx/eog/files/digest-eog-0.6-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e843959ff17f847e27a3219ac6cafcc7 eog-0.6.tar.gz 425084
diff --git a/media-gfx/eog/files/digest-eog-1.0.0 b/media-gfx/eog/files/digest-eog-1.0.0
deleted file mode 100644
index e27987ab4432..000000000000
--- a/media-gfx/eog/files/digest-eog-1.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bda45849d387b28afc3106bbe6ece5ca eog-1.0.0.tar.bz2 339812
diff --git a/media-gfx/eog/files/digest-eog-1.0.1-r1 b/media-gfx/eog/files/digest-eog-1.0.1-r1
deleted file mode 100644
index 42b737be8695..000000000000
--- a/media-gfx/eog/files/digest-eog-1.0.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0870d7a21aa33bc6c959ec8a83d0e003 eog-1.0.1.tar.bz2 346719
diff --git a/media-gfx/fbi/fbi-1.11.ebuild b/media-gfx/fbi/fbi-1.11.ebuild
deleted file mode 100644
index 892c145ea62f..000000000000
--- a/media-gfx/fbi/fbi-1.11.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-S=${WORKDIR}/${P}
-DESCRIPTION="fbi a framebuffer image viewer"
-SRC_URI="http://www.strusel007.de/linux/misc/`echo ${P} |sed -e 's:-:_:'`.tar.gz"
-HOMEPAGE="http://www.strusel007.de/linux/fbi.html"
-
-DEPEND=">=media-libs/jpeg-6b"
-
-
-src_unpack() {
-
-	unpack ${A}
-	
-	cd ${S}/src
-	sed -e "s:-O2:${CFLAGS}:" Makefile |cat >Makefile
-	
-	cd ${S}/libpcd
-	sed -e "s:-O2:${CFLAGS}:" Makefile |cat >Makefile
-}
-
-src_compile() {
-
-	make CC=gcc || die
-}
-
-src_install() {
-
-	make prefix=${D}/usr						\
-	     mandir=${D}/usr/share/man/man1				\
-	     install || die
-	
-	dodoc COPYING README
-
-}
diff --git a/media-gfx/fbi/fbi-1.21.ebuild b/media-gfx/fbi/fbi-1.21.ebuild
index 892c145ea62f..ea7eb9e053df 100644
--- a/media-gfx/fbi/fbi-1.21.ebuild
+++ b/media-gfx/fbi/fbi-1.21.ebuild
@@ -1,36 +1,29 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbi/fbi-1.21.ebuild,v 1.3 2002/07/23 04:33:46 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="fbi a framebuffer image viewer"
-SRC_URI="http://www.strusel007.de/linux/misc/`echo ${P} |sed -e 's:-:_:'`.tar.gz"
+SRC_URI="http://www.strusel007.de/linux/misc/${P/-/_}.tar.gz"
 HOMEPAGE="http://www.strusel007.de/linux/fbi.html"
 
-DEPEND=">=media-libs/jpeg-6b"
-
-
-src_unpack() {
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
 
-	unpack ${A}
-	
-	cd ${S}/src
-	sed -e "s:-O2:${CFLAGS}:" Makefile |cat >Makefile
-	
-	cd ${S}/libpcd
-	sed -e "s:-O2:${CFLAGS}:" Makefile |cat >Makefile
-}
+DEPEND=">=media-libs/jpeg-6b"
 
 src_compile() {
-
+	export CFLAGS="${CFLAGS}"
 	make CC=gcc || die
 }
 
 src_install() {
 
-	make prefix=${D}/usr						\
-	     mandir=${D}/usr/share/man/man1				\
-	     install || die
+	make \
+		prefix=${D}/usr \
+		mandir=${D}/usr/share/man/man1 \
+		install || die
 	
 	dodoc COPYING README
-
 }
diff --git a/media-gfx/fbi/files/digest-fbi-1.11 b/media-gfx/fbi/files/digest-fbi-1.11
deleted file mode 100644
index 9319f83802d8..000000000000
--- a/media-gfx/fbi/files/digest-fbi-1.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b7b49e0e4773f7b9c67a39d0ddf56c31 fbi_1.11.tar.gz 35940
diff --git a/media-gfx/feh/feh-1.0.1-r2.ebuild b/media-gfx/feh/feh-1.0.1-r2.ebuild
deleted file mode 100644
index d1e4b2eadc7b..000000000000
--- a/media-gfx/feh/feh-1.0.1-r2.ebuild
+++ /dev/null
@@ -1,25 +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/media-gfx/feh/feh-1.0.1-r2.ebuild,v 1.2 2002/07/11 06:30:27 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A fast, lightweight imageviewer using imlib2"
-SRC_URI="http://www.linuxbrit.co.uk/downloads/feh-1.0.1.tar.gz"
-HOMEPAGE="http://www.linuxbrit.co.uk/feh"
-
-DEPEND="media-libs/imlib2"
-
-src_compile() {
-
-    ./configure --prefix=/usr --infodir=/usr/share/info --host=${CHOST}
-    assert
-    emake || die
-}
-
-src_install () {
-
-    make DESTDIR=${D} install || die
-    rm -rf ${D}/usr/X11R6/doc
-    dodoc AUTHORS COPYING ChangeLog README TODO
-}
-
diff --git a/media-gfx/feh/feh-1.1.0.ebuild b/media-gfx/feh/feh-1.1.0.ebuild
deleted file mode 100644
index ebbf6de72fa0..000000000000
--- a/media-gfx/feh/feh-1.1.0.ebuild
+++ /dev/null
@@ -1,34 +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/media-gfx/feh/feh-1.1.0.ebuild,v 1.4 2002/07/11 06:30:27 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A fast, lightweight imageviewer using imlib2"
-SRC_URI="http://www.linuxbrit.co.uk/downloads/feh-${PV}.tar.gz"
-HOMEPAGE="http://www.linuxbrit.co.uk/feh"
-
-DEPEND="media-libs/imlib2"
-
-
-src_compile() {
-
-	./configure --prefix=/usr		\
-		--mandir=/usr/share/man		\
-		--infodir=/usr/share/info	\
-		--host=${CHOST} || die
-    
-	emake || die
-}
-
-src_install () {
-
-	make prefix=${D}/usr					\
-		mandir=${D}/usr/share/man			\
-		infodir=${D}/usr/share/info			\
-		docsdir=${D}/usr/share/doc/${PF}	\
-		install || die
-
-	# gzip the docs
-	gzip ${D}/usr/share/doc/${PF}/*
-}
-
diff --git a/media-gfx/feh/feh-1.1.1.ebuild b/media-gfx/feh/feh-1.1.1.ebuild
index 2101498ebde9..4c7a1d146fbe 100644
--- a/media-gfx/feh/feh-1.1.1.ebuild
+++ b/media-gfx/feh/feh-1.1.1.ebuild
@@ -1,34 +1,32 @@
-# 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/media-gfx/feh/feh-1.1.1.ebuild,v 1.2 2002/07/11 06:30:27 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/feh/feh-1.1.1.ebuild,v 1.3 2002/07/23 04:33:46 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A fast, lightweight imageviewer using imlib2"
 SRC_URI="http://www.linuxbrit.co.uk/downloads/feh-${PV}.tar.gz"
 HOMEPAGE="http://www.linuxbrit.co.uk/feh"
 
-DEPEND="media-libs/imlib2"
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="x86"
 
+DEPEND="media-libs/imlib2"
 
 src_compile() {
 
-	./configure --prefix=/usr		\
-		--mandir=/usr/share/man		\
-		--infodir=/usr/share/info	\
-		--host=${CHOST} || die
-    
+    econf || die
 	emake || die
 }
 
 src_install () {
+	
+	einstall \
+		docsdir=${D}/usr/share/doc/${PF} || die
 
-	make prefix=${D}/usr					\
-		mandir=${D}/usr/share/man			\
-		infodir=${D}/usr/share/info			\
-		docsdir=${D}/usr/share/doc/${PF}	\
-		install || die
-
+	doman feh.1
 	# gzip the docs
 	gzip ${D}/usr/share/doc/${PF}/*
-}
 
+	dodoc AUTHORS COPYING ChangeLog README TODO
+}
diff --git a/media-gfx/feh/files/digest-feh-1.0.1-r2 b/media-gfx/feh/files/digest-feh-1.0.1-r2
deleted file mode 100644
index e79ea113635f..000000000000
--- a/media-gfx/feh/files/digest-feh-1.0.1-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 151f54f6ad7a2fad87aebb1205d28b79 feh-1.0.1.tar.gz 461600
diff --git a/media-gfx/feh/files/digest-feh-1.1.0 b/media-gfx/feh/files/digest-feh-1.1.0
deleted file mode 100644
index 544cef7e9c29..000000000000
--- a/media-gfx/feh/files/digest-feh-1.1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ba39dde9998996b9728c074869ba75db feh-1.1.0.tar.gz 464391
diff --git a/media-gfx/gimp-freetype/files/digest-gimp-freetype-0.2-r1 b/media-gfx/gimp-freetype/files/digest-gimp-freetype-0.2-r1
deleted file mode 100644
index 848f5a93e414..000000000000
--- a/media-gfx/gimp-freetype/files/digest-gimp-freetype-0.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f8d01b5fa453f425cd1d0815ccde46d2 gimp-freetype-0.2.tar.gz 184128
diff --git a/media-gfx/gimp-freetype/gimp-freetype-0.2-r1.ebuild b/media-gfx/gimp-freetype/gimp-freetype-0.2-r1.ebuild
deleted file mode 100644
index 9d59cdada1cf..000000000000
--- a/media-gfx/gimp-freetype/gimp-freetype-0.2-r1.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/media-gfx/gimp-freetype/gimp-freetype-0.2-r1.ebuild,v 1.2 2002/07/11 06:30:27 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="GIMP freetype text plugin"
-SRC_URI="http://freetype.gimp.org/gimp-freetype-0.2.tar.gz"
-HOMEPAGE="http://freetype.gimp.org/"
-
-DEPEND=">=media-gfx/gimp-1.2.3-r1 >=media-libs/freetype-2.0.1"
-RDEPEND="virtual/glibc"
-
-
-src_compile() {
-	./configure --host=${CHOST} \
-	--prefix=/usr \
-	--mandir=/usr/share/man \
-	--infodir=/usr/share/info \
-	--sysconfdir=/etc/gimp/1.2/	\
-	--with-gimp-exec-prefix=/usr \
-	|| die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} prefix=${D}/usr\
-	install || die
-	dodoc AUTHORS ChangeLog COPYING NEWS README* TODO
-}
-
diff --git a/media-gfx/gimp-freetype/gimp-freetype-0.2-r2.ebuild b/media-gfx/gimp-freetype/gimp-freetype-0.2-r2.ebuild
index 10542f4677a2..fc3cec45c42f 100644
--- a/media-gfx/gimp-freetype/gimp-freetype-0.2-r2.ebuild
+++ b/media-gfx/gimp-freetype/gimp-freetype-0.2-r2.ebuild
@@ -1,16 +1,20 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-freetype/gimp-freetype-0.2-r2.ebuild,v 1.2 2002/07/11 06:30:27 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-freetype/gimp-freetype-0.2-r2.ebuild,v 1.3 2002/07/23 04:33:46 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="GIMP freetype text plugin"
 SRC_URI="http://freetype.gimp.org/gimp-freetype-0.2.tar.gz"
 HOMEPAGE="http://freetype.gimp.org/"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
 DEPEND=">=media-gfx/gimp-1.2.3-r1 
-		>=media-libs/freetype-2.0.1
-		nls? ( sys-devel/gettext )"
-RDEPEND="virtual/glibc"
+	>=media-libs/freetype-2.0.1"
+	
+RDEPEND="nls? ( sys-devel/gettext )"
 
 
 src_compile() {
@@ -18,13 +22,11 @@ src_compile() {
 	local myconf
 	use nls || myconf="${myconf} --disable-nls"
 
-	./configure --host=${CHOST} \
-	--prefix=/usr \
-	--mandir=/usr/share/man \
-	--infodir=/usr/share/info \
+	econf \
 	--sysconfdir=/etc/gimp/1.2/	\
 	--with-gimp-exec-prefix=/usr \
 	${myconf} || die
+
 	emake || die
 }
 
@@ -33,4 +35,3 @@ src_install() {
 	install || die
 	dodoc AUTHORS ChangeLog COPYING NEWS README* TODO
 }
-
diff --git a/media-gfx/gimp-print/files/digest-gimp-print-4.1.99_beta4 b/media-gfx/gimp-print/files/digest-gimp-print-4.1.99_beta4
deleted file mode 100644
index ab668afa07b4..000000000000
--- a/media-gfx/gimp-print/files/digest-gimp-print-4.1.99_beta4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a0edb7b97dbb93386fe124cc9d926aee gimp-print-4.1.99-b4.tar.gz 4917210
diff --git a/media-gfx/gimp-print/files/digest-gimp-print-4.1.99_beta4-r1 b/media-gfx/gimp-print/files/digest-gimp-print-4.1.99_beta4-r1
deleted file mode 100644
index ab668afa07b4..000000000000
--- a/media-gfx/gimp-print/files/digest-gimp-print-4.1.99_beta4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a0edb7b97dbb93386fe124cc9d926aee gimp-print-4.1.99-b4.tar.gz 4917210
diff --git a/media-gfx/gimp-print/gimp-print-4.1.99_beta4-r1.ebuild b/media-gfx/gimp-print/gimp-print-4.1.99_beta4-r1.ebuild
deleted file mode 100644
index 7817f37f7d15..000000000000
--- a/media-gfx/gimp-print/gimp-print-4.1.99_beta4-r1.ebuild
+++ /dev/null
@@ -1,73 +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/media-gfx/gimp-print/gimp-print-4.1.99_beta4-r1.ebuild,v 1.3 2002/07/11 06:30:27 drobbins Exp $
-
-MY_P="${PN}-`echo ${PV} |sed -e 's:_:-:' -e 's:eta::'`"
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Gimp Plugin and Ghostscript driver for Gimp"
-SRC_URI="mirror://sourceforge/gimp-print/${MY_P}.tar.gz"
-HOMEPAGE="http://gimp-print.sourceforge.net/"
-
-DEPEND=">=media-gfx/gimp-1.2.1
-	perl? ( app-text/texi2html )
-	gtk? ( ~x11-libs/gtk+-1.2.10 )
-	cups? ( net-print/cups )"
-
-RDEPEND="virtual/glibc"
-
-
-src_compile() {
-	
-	local myconf
-
-	use cups	\
-		&& myconf="${myconf} --with-cups"	\
-		|| myconf="${myconf} --without-cups"
-	
-	use nls || myconf="${myconf} --disable-nls"
-	
-	libtoolize --copy --force
-	aclocal
-	
-	./configure 	\
-		--host=${CHOST}					\
-		--prefix=/usr					\
-		--mandir=/usr/share/man				\
-		--infodir=/usr/share/info				\
-		--sysconfdir=/etc/gimp/1.2/				\
-		--with-gimp-exec-prefix=/usr			\
-		${myconf} || die
-
-	cp src/gimp/Makefile src/gimp/Makefile.orig
-	sed -e 's:--install-admin-bin:--install-bin:g'			\
-		src/gimp/Makefile.orig >src/gimp/Makefile
-	
-	emake || die
-}
-
-src_install() {
-	
-	dodir /usr/lib/gimp/1.2/.gimp-1.2/plug-ins
-	
-	make 	\
-		prefix=${D}/usr	\
-		bindir=${D}/usr/bin	\
-		mandir=${D}/usr/share/man	\
-		infodir=${D}/usr/share/info	\
-		sysconfdir=${D}/etc/gimp/1.2	\
-		libdir=${D}/usr/lib	\
-		datadir=${D}/usr/share	\
-		HOME=${D}/usr/lib/gimp/1.2	\
-		install || die
-
-	# NOTE: this build use gimptool to install the plugin, so
-	# if we dont do it this way, it will install to / no
-	# matter what.
-	#mv ${D}/usr/lib/gimp/1.2/.gimp-1.2/plug-ins/			\
-	#	${D}/usr/lib/gimp/1.2/
-	#rm -rf ${D}/usr/lib/gimp/1.2/.gimp-1.2/
-	     
-	dodoc AUTHORS ChangeLog COPYING NEWS README*
-	dohtml -r doc
-}
-
diff --git a/media-gfx/gimp-print/gimp-print-4.1.99_beta4.ebuild b/media-gfx/gimp-print/gimp-print-4.1.99_beta4.ebuild
deleted file mode 100644
index 85db2fa56efb..000000000000
--- a/media-gfx/gimp-print/gimp-print-4.1.99_beta4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-MY_P="${PN}-`echo ${PV} |sed -e 's:_:-:' -e 's:eta::'`"
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Gimp Plugin and Ghostscript driver for Gimp"
-SRC_URI="mirror://sourceforge/gimp-print/${MY_P}.tar.gz"
-HOMEPAGE="http://gimp-print.sourceforge.net/"
-
-DEPEND=">=media-gfx/gimp-1.2.1"
-
-RDEPEND="virtual/glibc"
-
-
-src_compile() {
-
-	./configure --host=${CHOST}					\
-		    --prefix=/usr					\
-		    --mandir=/usr/share/man				\
-		    --infodir=/usr/share/info				\
-		    --sysconfdir=/etc/gimp/1.2/				\
-		    --with-gimp-exec-prefix=/usr			\
-		    || die
-
-	cp src/gimp/Makefile src/gimp/Makefile.orig
-	sed -e 's:--install-admin-bin:--install-bin:g'			\
-		src/gimp/Makefile.orig >src/gimp/Makefile
-
-	make || die
-}
-
-src_install() {
-
-	dodir /usr/lib/gimp/1.2/.gimp-1.2/plug-ins
-
-	make prefix=${D}/usr						\
-	     mandir=${D}/usr/share/man					\
-	     infodir=${D}/usr/share/info				\
-	     sysconfdir=${D}/etc/gimp/1.2/				\
-	     HOME=${D}/usr/lib/gimp/1.2/				\
-	     install || die
-
-	# NOTE: this build use gimptool to install the plugin, so
-	# if we dont do it this way, it will install to / no
-	# matter what.
-	mv ${D}/usr/lib/gimp/1.2/.gimp-1.2/plug-ins/			\
-		${D}/usr/lib/gimp/1.2/
-	rm -rf ${D}/usr/lib/gimp/1.2/.gimp-1.2/
-	     
-	dodoc AUTHORS ChangeLog COPYING NEWS README*
-}
-
diff --git a/media-gfx/gimp-print/gimp-print-4.2.1.ebuild b/media-gfx/gimp-print/gimp-print-4.2.1.ebuild
index dae3c2a22504..b5f08e585f9a 100644
--- a/media-gfx/gimp-print/gimp-print-4.2.1.ebuild
+++ b/media-gfx/gimp-print/gimp-print-4.2.1.ebuild
@@ -1,38 +1,40 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-print/gimp-print-4.2.1.ebuild,v 1.3 2002/07/11 06:30:27 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-print/gimp-print-4.2.1.ebuild,v 1.4 2002/07/23 04:33:46 seemant Exp $
 
-MY_P="${PN}-`echo ${PV} |sed -e 's:_:-:' -e 's:eta::'`"
+inherit libtool
+
+MY_P=${P}
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="Gimp Plugin and Ghostscript driver for Gimp"
 SRC_URI="mirror://sourceforge/gimp-print/${MY_P}.tar.gz"
 HOMEPAGE="http://gimp-print.sourceforge.net/"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
 DEPEND=">=media-gfx/gimp-1.2.1
 	doc? ( app-text/texi2html )
-	gtk? ( ~x11-libs/gtk+-1.2.10 )
+	gtk? ( =x11-libs/gtk+-1.2* )
 	cups? ( net-print/cups )"
 
 RDEPEND="virtual/glibc"
 
-
 src_compile() {
 	
+	elibtoolize
+	aclocal
+
 	local myconf
 
-	use cups	\
-		&& myconf="${myconf} --with-cups"	\
+	use cups \
+		&& myconf="${myconf} --with-cups" \
 		|| myconf="${myconf} --without-cups"
 	
 	use nls || myconf="${myconf} --disable-nls"
 	
-	libtoolize --copy --force
-	aclocal
-	
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
+	econf \
 		--sysconfdir=/etc/gimp/1.2/ \
 		--with-gimp-exec-prefix=/usr \
 		${myconf} || die
@@ -73,4 +75,3 @@ src_install() {
 	dodoc AUTHORS ChangeLog COPYING NEWS README*
 	dohtml -r doc
 }
-
diff --git a/media-gfx/gimp/files/digest-gimp-1.3.5 b/media-gfx/gimp/files/digest-gimp-1.3.5
deleted file mode 100644
index 4fbfc102840b..000000000000
--- a/media-gfx/gimp/files/digest-gimp-1.3.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e5434603e2fd13bc6385afd089748f32 gimp-1.3.5.tar.bz2 9847840
diff --git a/media-gfx/gimp/files/digest-gimp-1.3.7 b/media-gfx/gimp/files/digest-gimp-1.3.7
deleted file mode 100644
index 2e8fdb87fc6d..000000000000
--- a/media-gfx/gimp/files/digest-gimp-1.3.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1c4e7c0a0a09125c1d8b518eb1f1beef gimp-1.3.7.tar.bz2 9640060
diff --git a/media-gfx/gimp/gimp-1.3.5.ebuild b/media-gfx/gimp/gimp-1.3.5.ebuild
deleted file mode 100644
index 0371c692a851..000000000000
--- a/media-gfx/gimp/gimp-1.3.5.ebuild
+++ /dev/null
@@ -1,65 +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/media-gfx/gimp/gimp-1.3.5.ebuild,v 1.1 2002/05/23 00:02:19 spider Exp $
-
-
-# Do _NOT_ strip symbols in the build! Need both lines for Portage 1.8.9+
-DEBUG="yes"
-RESTRICT="nostrip"
-# force debug information
-CFLAGS="${CFLAGS} -g"
-CXXFLAGS="${CXXFLAGS} -g"
-
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Development series of Gimp"
-SRC_URI="ftp://ftp.gimp.org/pub/gimp/v1.3/v1.3.5/${P}.tar.bz2"
-HOMEPAGE="http://www.gimp.org/"
-SLOT="1.4"
-
-#libglade
-RDEPEND=">=x11-libs/gtk+-2.0.0
-	>=x11-libs/pango-1.0.0
-	>=dev-libs/glib-2.0.0
-	>=media-libs/libpng-1.2.1
-	>=media-libs/jpeg-6b-r2
-	>=media-libs/tiff-3.5.7
-	>=media-libs/libart_lgpl-2.3.8-r1
-	sys-devel/gettext"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	doc? ( >=dev-util/gtk-doc-0.9-r2 )"
-
-src_compile() {
-	local myconf
-	use doc && myconf="${myconf} --enable-gtk-doc" || myconf="${myconf} --disable-gtk-doc"
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--localstatedir=/var/lib \
-		--disable-perl ${myconf} \
-		--without-gnome-desktop \
-		|| die
-	# disable gnome-desktop since it breaks sandboxing
-
-# hack for odd make break
-	touch plug-ins/common/${P}.tar.bz2
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} prefix=/usr \
-		sysconfdir=/etc \
-		infodir=/usr/share/info \
-		mandir=/usr/share/man \
-		localstatedir=/var/lib \
-		install || die
-    
-	dodoc AUTHORS COPYING ChangeL* HACKING INSTALL MAINTAINERS NEWS PLUGIN_MAINTAINERS README* TODO* 
-
-}
-
-
diff --git a/media-gfx/gimp/gimp-1.3.7.ebuild b/media-gfx/gimp/gimp-1.3.7.ebuild
deleted file mode 100644
index ab690fb68af5..000000000000
--- a/media-gfx/gimp/gimp-1.3.7.ebuild
+++ /dev/null
@@ -1,68 +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/media-gfx/gimp/gimp-1.3.7.ebuild,v 1.1 2002/06/02 01:19:32 spider Exp $
-
-
-# Do _NOT_ strip symbols in the build! Need both lines for Portage 1.8.9+
-DEBUG="yes"
-RESTRICT="nostrip"
-# force debug information
-CFLAGS="${CFLAGS} -g"
-CXXFLAGS="${CXXFLAGS} -g"
-
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Development series of Gimp"
-SRC_URI="ftp://ftp.gimp.org/pub/gimp/v1.3/v${PV}/${P}.tar.bz2"
-HOMEPAGE="http://www.gimp.org/"
-SLOT="1.4"
-
-#libglade
-RDEPEND=">=x11-libs/gtk+-2.0.0
-	>=x11-libs/pango-1.0.0
-	>=dev-libs/glib-2.0.0
-	>=media-libs/libpng-1.2.1
-	>=media-libs/jpeg-6b-r2
-	>=media-libs/tiff-3.5.7
-	>=media-libs/libart_lgpl-2.3.8-r1
-	sys-devel/gettext
-	cups? ( media-gfx/gimp-print )
-	"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	doc? ( >=dev-util/gtk-doc-0.9-r2 )"
-
-src_compile() {
-	local myconf
-	use doc && myconf="${myconf} --enable-gtk-doc" || myconf="${myconf} --disable-gtk-doc"
-	use cups && myconf="${myconf} --enable-print" || myconf="${myconf} --disable-print"
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--localstatedir=/var/lib \
-		--disable-perl ${myconf} \
-		--without-gnome-desktop \
-		|| die
-	# disable gnome-desktop since it breaks sandboxing
-
-# hack for odd make break
-	touch plug-ins/common/${P}.tar.bz2
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} prefix=/usr \
-		sysconfdir=/etc \
-		infodir=/usr/share/info \
-		mandir=/usr/share/man \
-		localstatedir=/var/lib \
-		install || die
-    
-	dodoc AUTHORS COPYING ChangeL* HACKING INSTALL MAINTAINERS NEWS PLUGIN_MAINTAINERS README* TODO* 
-
-}
-
-
diff --git a/media-gfx/gliv/files/digest-gliv-1.5.1 b/media-gfx/gliv/files/digest-gliv-1.5.1
deleted file mode 100644
index 611d27e9211e..000000000000
--- a/media-gfx/gliv/files/digest-gliv-1.5.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 48725573023ae32913e9be82292feab7 gliv-1.5.1.tar.bz2 231877
diff --git a/media-gfx/gliv/files/digest-gliv-1.5.2 b/media-gfx/gliv/files/digest-gliv-1.5.2
deleted file mode 100644
index 60c584f1d884..000000000000
--- a/media-gfx/gliv/files/digest-gliv-1.5.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6ab41228f5f7ce1a3a0a7299d627341e gliv-1.5.2.tar.bz2 235878
diff --git a/media-gfx/gliv/gliv-1.5.1.ebuild b/media-gfx/gliv/gliv-1.5.1.ebuild
deleted file mode 100644
index 99bfe0ba0045..000000000000
--- a/media-gfx/gliv/gliv-1.5.1.ebuild
+++ /dev/null
@@ -1,41 +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/media-gfx/gliv/gliv-1.5.1.ebuild,v 1.5 2002/07/11 06:30:27 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="An image viewer that uses OpenGL"
-SRC_URI="http://gliv.tuxfamily.org/gliv-${PV}.tar.bz2"
-HOMEPAGE="http://gliv.tuxfamily.org"
-
-# as from version 1.5.1, it could use gtk+-2.0, but not
-# gtkglarea-1.99.0 yet, thus we have to use gtk-1.2 ...
-# please check this with future versions !!!!
-DEPEND="=x11-libs/gtk+-1.2*
-	media-libs/gdk-pixbuf
-	<x11-libs/gtkglarea-1.99.0
-	virtual/opengl"
-
-
-src_compile() {
-
-	local myconf=""
-
-	# Dont use gtk+-2.0 until we can use >=gtkglarea-1.99.0
-	myconf="${myconf} --disable-gtk2"
-
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--host=${CHOST} \
-		${myconf} || die
-	
-	emake || die
-}
-
-src_install() {
-
-    make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		install || die
-    
-    dodoc COPYING README NEWS THANKS
-}
diff --git a/media-gfx/gliv/gliv-1.5.2.ebuild b/media-gfx/gliv/gliv-1.5.2.ebuild
deleted file mode 100644
index 46e0dc585453..000000000000
--- a/media-gfx/gliv/gliv-1.5.2.ebuild
+++ /dev/null
@@ -1,60 +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/media-gfx/gliv/gliv-1.5.2.ebuild,v 1.2 2002/07/11 06:30:27 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="An image viewer that uses OpenGL"
-SRC_URI="http://gliv.tuxfamily.org/gliv-${PV}.tar.bz2"
-HOMEPAGE="http://gliv.tuxfamily.org"
-
-# Version 1.5.2 and later of gliv can use gtkglarea-1.99.0 or
-# later, but will fail to compile if gtk+-2.0 is present, but
-# not >=gtkglarea-1.99.0
-#
-# The basic theory here is that we just specify:
-#
-#   DEPEND="x11-libs/gtk+ x11-libs/gtkglarea"
-#
-# which will pull in whatever versions of both that is
-# not masked.  We then check in src_compile() what version
-# of gtkglarea should be used.
-#
-# Azarah - 20 Jun 2002
-
-DEPEND="x11-libs/gtk+
-	media-libs/gdk-pixbuf
-	x11-libs/gtkglarea
-	virtual/opengl
-	>=dev-util/pkgconfig-0.12.0"
-
-
-src_compile() {
-
-	local myconf=""
-
-	# Dont use gtk+-2.0 if ! gtkglarea >= 1.99.0
-	if ! (pkg-config gtk+-2.0) || ! (pkg-config gtkgl-2.0)
-	then
-		einfo "Using Gtk+-1.2 and GtkGL-1.2"
-		myconf="${myconf} --disable-gtk2"
-	else
-		einfo "Using Gtk+-2.0 and GtkGL-2.0"
-	fi
-
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--host=${CHOST} \
-		${myconf} || die
-	
-	emake || die
-}
-
-src_install() {
-
-    make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		install || die
-    
-    dodoc COPYING README NEWS THANKS
-}
-
diff --git a/media-gfx/gliv/gliv-1.5.3.ebuild b/media-gfx/gliv/gliv-1.5.3.ebuild
index 5b5b69352885..f1a04c5e9344 100644
--- a/media-gfx/gliv/gliv-1.5.3.ebuild
+++ b/media-gfx/gliv/gliv-1.5.3.ebuild
@@ -1,12 +1,16 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gliv/gliv-1.5.3.ebuild,v 1.2 2002/07/11 06:30:27 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gliv/gliv-1.5.3.ebuild,v 1.3 2002/07/23 04:33:46 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="An image viewer that uses OpenGL"
 SRC_URI="http://gliv.tuxfamily.org/gliv-${PV}.tar.bz2"
 HOMEPAGE="http://gliv.tuxfamily.org"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
 # Version 1.5.2 and later of gliv can use gtkglarea-1.99.0 or
 # later, but will fail to compile if gtk+-2.0 is present, but
 # not >=gtkglarea-1.99.0
@@ -57,4 +61,3 @@ src_install() {
     
     dodoc COPYING README NEWS THANKS
 }
-
diff --git a/media-gfx/gnome-iconedit/files/digest-gnome-iconedit-1.2.0-r3 b/media-gfx/gnome-iconedit/files/digest-gnome-iconedit-1.2.0-r3
deleted file mode 100644
index 2ef172ccdb49..000000000000
--- a/media-gfx/gnome-iconedit/files/digest-gnome-iconedit-1.2.0-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 76fcee700222898cc322a12844fb813a gnome-iconedit_1.2.0.orig.tar.gz 205360
diff --git a/media-gfx/gnome-iconedit/files/digest-gnome-iconedit-1.2.0-r4 b/media-gfx/gnome-iconedit/files/digest-gnome-iconedit-1.2.0-r4
deleted file mode 100644
index 2ef172ccdb49..000000000000
--- a/media-gfx/gnome-iconedit/files/digest-gnome-iconedit-1.2.0-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 76fcee700222898cc322a12844fb813a gnome-iconedit_1.2.0.orig.tar.gz 205360
diff --git a/media-gfx/gnome-iconedit/gnome-iconedit-1.2.0-r3.ebuild b/media-gfx/gnome-iconedit/gnome-iconedit-1.2.0-r3.ebuild
deleted file mode 100644
index bb7189a2510c..000000000000
--- a/media-gfx/gnome-iconedit/gnome-iconedit-1.2.0-r3.ebuild
+++ /dev/null
@@ -1,63 +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/media-gfx/gnome-iconedit/gnome-iconedit-1.2.0-r3.ebuild,v 1.3 2002/07/11 06:30:27 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Edits icons, what more can you say?"
-SRC_URI="http://210.77.60.218/ftp/ftp.debian.org/pool/main/g/gnome-iconedit/gnome-iconedit_${PV}.orig.tar.gz"
-HOMEPAGE="www.advogato.org/proj/GNOME-Iconedit/"
-
-DEPEND=">=gnome-base/gnome-libs-1.4.1.2-r1
-	=x11-libs/gtk+-1.2*
-	>=media-libs/gdk-pixbuf-0.11.0-r1
-	media-libs/libpng
-	gnome-base/ORBit"
-# Gnome-Print support is broken
-#	>=gnome-base/gnome-print-0.30
-# Bonobo support is broken
-#	bonobo? ( gnome-base/bonobo )"
-
-
-
-src_unpack() {
-
-	unpack ${A}
-
-	# Fix some compile / #include errors
-	cd ${S}
-	patch -p1 <${FILESDIR}/gnome-iconedit.diff || die
-
-	# Update the Makefiles.
-	export WANT_AUTOMAKE_1_4=1
-	export WANT_AUTOCONF_2_1=1
-	automake --add-missing
-	autoconf
-}
-
-src_compile() {
-
-	local myconf
-	use nls || myconf="--disable-nls"
-	
-	CFLAGS="${CFLAGS} `gnome-config --cflags print`"	
-
-	./configure --host=${CHOST} 					\
-		    --prefix=/usr					\
-		    --mandir=/usr/share/man				\
-		    --infodir=/usr/share/info				\
-		    --with-sysconfdir=/etc				\
-		    --without-gnome-print				\
-		    $myconf || die
-
-	emake || die
-}
-
-src_install() {
-
-	make prefix=${D}/usr						\
-	     mandir=${D}/usr/share/man					\
-	     infodir=${D}/usr/share/info				\
-	     sysconfdir=${D}/etc install || die
-
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-}
diff --git a/media-gfx/gnome-iconedit/gnome-iconedit-1.2.0-r4.ebuild b/media-gfx/gnome-iconedit/gnome-iconedit-1.2.0-r4.ebuild
deleted file mode 100644
index d61d1ec7ba8a..000000000000
--- a/media-gfx/gnome-iconedit/gnome-iconedit-1.2.0-r4.ebuild
+++ /dev/null
@@ -1,63 +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/media-gfx/gnome-iconedit/gnome-iconedit-1.2.0-r4.ebuild,v 1.3 2002/07/11 06:30:27 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Edits icons, what more can you say?"
-SRC_URI="http://210.77.60.218/ftp/ftp.debian.org/pool/main/g/gnome-iconedit/gnome-iconedit_${PV}.orig.tar.gz"
-HOMEPAGE="www.advogato.org/proj/GNOME-Iconedit/"
-
-DEPEND=">=gnome-base/gnome-libs-1.4.1.2-r1
-	=x11-libs/gtk+-1.2*
-	>=media-libs/gdk-pixbuf-0.11.0-r1
-	media-libs/libpng
-	gnome-base/ORBit"
-# Gnome-Print support is broken
-#	>=gnome-base/gnome-print-0.30
-# Bonobo support is broken
-#	bonobo? ( gnome-base/bonobo )"
-
-
-
-src_unpack() {
-
-	unpack ${A}
-
-	# Fix some compile / #include errors
-	cd ${S}
-	patch -p1 <${FILESDIR}/gnome-iconedit.diff || die
-
-	# Update the Makefiles.
-	export WANT_AUTOMAKE_1_4=1
-	export WANT_AUTOCONF_2_1=1
-	automake --add-missing
-	autoconf
-}
-
-src_compile() {
-
-	local myconf
-	use nls || myconf="--disable-nls"
-	
-	CFLAGS="${CFLAGS} `gnome-config --cflags print`"	
-
-	./configure --host=${CHOST} 					\
-		--prefix=/usr					\
-		--mandir=/usr/share/man				\
-		--infodir=/usr/share/info				\
-		--with-sysconfdir=/etc				\
-		--without-gnome-print				\
-		${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-
-	make prefix=${D}/usr						\
-		mandir=${D}/usr/share/man					\
-		infodir=${D}/usr/share/info				\
-		sysconfdir=${D}/etc install || die
-
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-}
diff --git a/media-gfx/gnome-iconedit/gnome-iconedit-1.2.0-r5.ebuild b/media-gfx/gnome-iconedit/gnome-iconedit-1.2.0-r5.ebuild
index 8b0460e90ebb..f3f582706058 100644
--- a/media-gfx/gnome-iconedit/gnome-iconedit-1.2.0-r5.ebuild
+++ b/media-gfx/gnome-iconedit/gnome-iconedit-1.2.0-r5.ebuild
@@ -1,14 +1,16 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnome-iconedit/gnome-iconedit-1.2.0-r5.ebuild,v 1.3 2002/07/11 06:30:27 drobbins Exp $
-
-LICENSE="GPL-2"
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnome-iconedit/gnome-iconedit-1.2.0-r5.ebuild,v 1.4 2002/07/23 04:33:46 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Edits icons, what more can you say?"
-SRC_URI="http://210.77.60.218/ftp/ftp.debian.org/pool/main/g/gnome-iconedit/gnome-iconedit_${PV}.orig.tar.gz"
+SRC_URI="http://210.77.60.218/ftp/ftp.debian.org/pool/main/g/${PN}/${PN}_${PV}.orig.tar.gz"
 HOMEPAGE="www.advogato.org/proj/GNOME-Iconedit/"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
 DEPEND=">=gnome-base/gnome-libs-1.4.1.2-r1
 	=x11-libs/gtk+-1.2*
 	>=media-libs/gdk-pixbuf-0.11.0-r1
@@ -43,12 +45,8 @@ src_compile() {
 	
 	CFLAGS="${CFLAGS} `gnome-config --cflags print` -I/usr/include/gdk-pixbuf-1.0"	
 
-	./configure --host=${CHOST} 					\
-		--prefix=/usr					\
-		--mandir=/usr/share/man				\
-		--infodir=/usr/share/info				\
-		--with-sysconfdir=/etc				\
-		--without-gnome-print				\
+	econf \
+		--without-gnome-print \
 		${myconf} || die
 
 	emake || die
@@ -56,10 +54,7 @@ src_compile() {
 
 src_install() {
 
-	make prefix=${D}/usr						\
-		mandir=${D}/usr/share/man					\
-		infodir=${D}/usr/share/info				\
-		sysconfdir=${D}/etc install || die
+	einstall || die
 
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
+	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
 }
diff --git a/media-gfx/gnuplot/files/digest-gnuplot-3.7.1-r2 b/media-gfx/gnuplot/files/digest-gnuplot-3.7.1-r2
deleted file mode 100644
index b393482c3a52..000000000000
--- a/media-gfx/gnuplot/files/digest-gnuplot-3.7.1-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 30798b4c14ea734969a86ee41a9c1dca gnuplot-3.7.1.tar.gz 1319233
diff --git a/media-gfx/gnuplot/gnuplot-3.7.1-r2.ebuild b/media-gfx/gnuplot/gnuplot-3.7.1-r2.ebuild
deleted file mode 100644
index 5932aa10d763..000000000000
--- a/media-gfx/gnuplot/gnuplot-3.7.1-r2.ebuild
+++ /dev/null
@@ -1,85 +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/media-gfx/gnuplot/gnuplot-3.7.1-r2.ebuild,v 1.2 2002/07/11 06:30:27 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Quick and useful plotting program"
-SRC_URI="ftp://ftp.gnuplot.org/pub/gnuplot/${P}.tar.gz"
-HOMEPAGE="http://www.gnuplot.org"
-
-DEPEND="media-libs/libpng
-	plotutils? ( media-libs/plotutils )
-	readline? ( sys-libs/readline )
-	X? ( virtual/x11 )
-	svga? ( media-libs/svgalib )"
-
-src_compile() {
-	local myvar
-	#--with-lasergnu flag seems to be broken and I'm too lazy to fix now
-	#myvar=" --with-png --without-gd --with-lasergnu"
-	myvar=" --with-png --without-gd --with-plot=/usr/lib"
-	#--with-plot enables the Gnu plotutils library
-	#need to specify path to differentiate from Unix plot
-	if [ -z "`use plotutils`" ]
-	then
-		myvar="${myvar} --without-plot"
-	else
-		myvar="${myvar} --with-plot=/usr/lib"
-	fi
-	if [ -z "`use X`" ]
-	then
-		myvar="${myvar} --without-x"
-	else
-		myvar="${myvar} --with-x"
-	fi
-	if [ -z "`use readline`" ]
-	then
-		#use the built-in readline
-		myvar="${myvar} --with-readline"
-	else
-		#use gnu readline
-		myvar="${myvar} --with-readline=gnu"
-	fi
-	if [ -z "`use svga`" ]
-	then
-		myvar="${myvar} --without-linux-vga"
-	else
-		myvar="${myvar} --with-linux-vga"
-	fi
-	./configure \
-		${myvar} \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--datadir=/usr/share/gnuplot \
-		--mandir=/usr/share/man || die
-	mv Makefile Makefile.orig
-	sed -e 's/datadir = \/usr/datadir = ${prefix}/'  \
-	    -e 's/mandir = \/usr/mandir = ${prefix}/' \
-	    Makefile.orig > Makefile
-	cd docs
-	mv Makefile Makefile.orig
-	sed -e 's/datadir = \/usr/datadir = ${prefix}/' Makefile.orig > Makefile
-	cd ..
-	emake || die
-}
-
-src_install () {
-	make prefix=${D}/usr install || die
-}
-
-pkg_postinst() {
-	if [ "`use svga`" ]
-	then
-		einfo ""	
-		einfo "*****************************************************************"
-		einfo " In order to enable ordinary users to use SVGA console graphics"
-		einfo " gnuplot needs to be set up as setuid root.  Please note that"
-		einfo " this is usually considered to be a security hazard."
-		einfo " As root, manually chmod u+s /usr/bin/gnuplot"
-		einfo "*****************************************************************"
-		einfo
-	fi
-}
-
-
diff --git a/media-gfx/gnuplot/gnuplot-3.7.1-r3.ebuild b/media-gfx/gnuplot/gnuplot-3.7.1-r3.ebuild
index eec6097e43c7..7f5d877e5e78 100644
--- a/media-gfx/gnuplot/gnuplot-3.7.1-r3.ebuild
+++ b/media-gfx/gnuplot/gnuplot-3.7.1-r3.ebuild
@@ -1,66 +1,61 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnuplot/gnuplot-3.7.1-r3.ebuild,v 1.2 2002/07/11 06:30:27 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnuplot/gnuplot-3.7.1-r3.ebuild,v 1.3 2002/07/23 04:33:46 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Quick and useful plotting program"
 SRC_URI="ftp://ftp.gnuplot.org/pub/gnuplot/${P}.tar.gz"
 HOMEPAGE="http://www.gnuplot.org"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
 DEPEND="media-libs/libpng
-	plotutils? ( media-libs/plotutils )
-	readline? ( sys-libs/readline )
 	X? ( virtual/x11 )
-	svga? ( media-libs/svgalib )"
+	svga? ( media-libs/svgalib )
+	readline? ( sys-libs/readline )
+	plotutils? ( media-libs/plotutils )"
 
 src_compile() {
-	local myvar
+	local myconf
 	#--with-lasergnu flag seems to be broken and I'm too lazy to fix now
-	#myvar=" --with-png --without-gd --with-lasergnu"
-	myvar=" --with-png --without-gd --with-plot=/usr/lib"
+	#myconf=" --with-png --without-gd --with-lasergnu"
+	myconf=" --with-png --without-gd --with-plot=/usr/lib"
 	#--with-plot enables the Gnu plotutils library
 	#need to specify path to differentiate from Unix plot
-	if [ -z "`use plotutils`" ]
-	then
-		myvar="${myvar} --without-plot"
-	else
-		myvar="${myvar} --with-plot=/usr/lib"
-	fi
-	if [ -z "`use X`" ]
-	then
-		myvar="${myvar} --without-x"
-	else
-		myvar="${myvar} --with-x"
-	fi
-	if [ -z "`use readline`" ]
-	then
-		#use the built-in readline
-		myvar="${myvar} --with-readline"
-	else
-		#use gnu readline
-		myvar="${myvar} --with-readline=gnu"
-	fi
-	if [ -z "`use svga`" ]
-	then
-		myvar="${myvar} --without-linux-vga"
-	else
-		myvar="${myvar} --with-linux-vga"
-	fi
-	./configure \
-		${myvar} \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
+
+	use plotutils \
+		&& myconf="${myconf} --with-plot=/usr/lib" \
+		|| myconf="${myconf} --without-plot"
+
+	use X \
+		&& myconf="${myconf} --with-x" \
+		|| myconf="${myconf} --without-x"
+
+	use readline \
+		&& myconf="${myconf} --with-readline=gnu" \
+		|| myconf="${myconf} --with-readline"
+
+	use svga \
+		&& myconf="${myconf} --with-linux-vga" \
+		|| myconf="${myconf} --without-linux-vga"
+
+	econf \
 		--datadir=/usr/share/gnuplot \
-		--mandir=/usr/share/man || die
+		${myconf} || die
+
 	mv Makefile Makefile.orig
-	sed -e 's/datadir = \/usr/datadir = ${prefix}/'  \
+	sed -e 's/datadir = \/usr/datadir = ${prefix}/' \
 	    -e 's/mandir = \/usr/mandir = ${prefix}/' \
 	    Makefile.orig > Makefile
+
 	cd docs
 	mv Makefile Makefile.orig
-	sed -e 's/datadir = \/usr/datadir = ${prefix}/' Makefile.orig > Makefile
-	cd ..
+	sed -e 's/datadir = \/usr/datadir = ${prefix}/' \
+		Makefile.orig > Makefile
+
+	cd ${S}
 	emake || die
 }
 
@@ -81,5 +76,3 @@ pkg_postinst() {
 		einfo
 	fi
 }
-
-
diff --git a/media-gfx/gozer/gozer-0.7.ebuild b/media-gfx/gozer/gozer-0.7.ebuild
index 124bc5d49970..765c79ef9d91 100644
--- a/media-gfx/gozer/gozer-0.7.ebuild
+++ b/media-gfx/gozer/gozer-0.7.ebuild
@@ -1,25 +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/media-gfx/gozer/gozer-0.7.ebuild,v 1.1 2002/06/03 22:28:32 stroke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gozer/gozer-0.7.ebuild,v 1.2 2002/07/23 04:33:46 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="tool for rendering arbitary text as graphics, using ttfs and styles"
 SRC_URI="http://www.linuxbrit.co.uk/downloads/${P}.tar.gz"
 HOMEPAGE="http://www.linuxbrit.co.uk/"
-LICENSE="GPL-2"
+
 SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
 
-DEPEND=">=x11-base/xfree-4.0.0
+DEPEND="virtual/x11
 	>=media-libs/giblib-1.2.1"
 
-
-
 src_compile() {
 
-	./configure --infodir=/usr/share/info \
-		    --mandir=/usr/share/man \
-		    --prefix=/usr --host=${CHOST} || die
-
+	econf || die
 	emake || die
 }
 
@@ -30,4 +27,3 @@ src_install() {
 
 	dodoc TODO README AUTHORS ChangeLog
 }
-
diff --git a/media-gfx/gphoto/files/digest-gphoto-0.4.3-r1 b/media-gfx/gphoto/files/digest-gphoto-0.4.3-r1
deleted file mode 100644
index 5b969bfce3f4..000000000000
--- a/media-gfx/gphoto/files/digest-gphoto-0.4.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8b4e70df78870479d2d9a45c8f4db5f4 gphoto-0.4.3.tar.gz 709336
diff --git a/media-gfx/gphoto/gphoto-0.4.3-r1.ebuild b/media-gfx/gphoto/gphoto-0.4.3-r1.ebuild
deleted file mode 100644
index 3a14a0f9e2c9..000000000000
--- a/media-gfx/gphoto/gphoto-0.4.3-r1.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/media-gfx/gphoto/gphoto-0.4.3-r1.ebuild,v 1.3 2002/07/11 06:30:27 drobbins Exp $
-
-
-S=${WORKDIR}/${P}
-DESCRIPTION="free, redistributable digital camera software application"
-SRC_URI="http://www.gphoto.net/dist/${P}.tar.gz"
-HOMEPAGE="http://www.gphoto.org"
-
-DEPEND="virtual/glibc
-	>=media-libs/imlib-1.9.10-r1
-	>=media-gfx/imagemagick-4.1"
-	
-
-src_compile() {
-
-	# -pipe does no work
-	CFLAGS="${CFLAGS/-pipe}"
-	./configure --prefix=/usr --sysconfdir=/etc/gnome || die
-	make clean || die
-	pmake || die
-}
-
-src_install() {
-	 make prefix=${D}/usr sysconfdir=${D}/etc/gnome  install || die
-	 dodoc AUTHORS CONTACTS COPYING ChangeLog FAQ MANUAL NEWS* PROGRAMMERS \
-		 README THANKS THEMES TODO
-}
-
diff --git a/media-gfx/gphoto/gphoto-0.4.3-r2.ebuild b/media-gfx/gphoto/gphoto-0.4.3-r2.ebuild
index 9f2fb4678ec1..17a32894926b 100644
--- a/media-gfx/gphoto/gphoto-0.4.3-r2.ebuild
+++ b/media-gfx/gphoto/gphoto-0.4.3-r2.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/media-gfx/gphoto/gphoto-0.4.3-r2.ebuild,v 1.2 2002/07/11 06:30:27 drobbins Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto/gphoto-0.4.3-r2.ebuild,v 1.3 2002/07/23 04:33:46 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="free, redistributable digital camera software application"
 SRC_URI="http://www.gphoto.net/dist/${P}.tar.gz"
 HOMEPAGE="http://www.gphoto.org"
 
-DEPEND="virtual/glibc
-	>=media-libs/imlib-1.9.10-r1
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
+DEPEND="media-libs/imlib
 	>=media-gfx/imagemagick-4.1"
 
 src_unpack() {
@@ -32,4 +34,3 @@ src_install() {
 	 dodoc AUTHORS CONTACTS COPYING ChangeLog FAQ MANUAL NEWS* PROGRAMMERS \
 		 README THANKS THEMES TODO
 }
-
diff --git a/media-gfx/gphoto2/gphoto2-2.0-r1.ebuild b/media-gfx/gphoto2/gphoto2-2.0-r1.ebuild
index f31fac90c728..a8c80028ba30 100644
--- a/media-gfx/gphoto2/gphoto2-2.0-r1.ebuild
+++ b/media-gfx/gphoto2/gphoto2-2.0-r1.ebuild
@@ -1,23 +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/media-gfx/gphoto2/gphoto2-2.0-r1.ebuild,v 1.3 2002/07/11 06:30:27 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto2/gphoto2-2.0-r1.ebuild,v 1.4 2002/07/23 04:33:46 seemant Exp $
 
-MY_P="${PN}-`echo ${PV} |sed -e 's:_::'`"
+inherit libtool
+
+MY_P="${PN}-${PV/_/}
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="free, redistributable digital camera software application"
 SRC_URI="http://www.gphoto.net/dist/${MY_P}.tar.gz"
 HOMEPAGE="http://www.gphoto.org/"
 
-DEPEND="virtual/glibc
-	>=dev-libs/libusb-0.1.5
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
+DEPEND=">=dev-libs/libusb-0.1.5
 	=dev-libs/glib-1.2*
 	>=sys-libs/zlib-1.1.4"
 
-
 src_compile() {
 
-	#update libtool to fix "relink" bug.
-	libtoolize --copy --force
+	elibtoolize
 	aclocal
 
 	# -pipe does no work
@@ -44,4 +47,3 @@ src_install() {
 	dodoc ChangeLog NEWS* README
 	rm -rf ${D}/usr/share/doc/${PF}/sgml/gphoto2
 }
-
diff --git a/media-gfx/gqview/files/digest-gqview-1.0.2 b/media-gfx/gqview/files/digest-gqview-1.0.2
deleted file mode 100644
index 7344bcc9b86b..000000000000
--- a/media-gfx/gqview/files/digest-gqview-1.0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 eeb4eeec54dbc0560937e7f30256ac6c gqview-1.0.2.tar.gz 642698
diff --git a/media-gfx/gqview/gqview-1.0.2-r1.ebuild b/media-gfx/gqview/gqview-1.0.2-r1.ebuild
index a7fbbf088eca..7fc4a69b0b3d 100644
--- a/media-gfx/gqview/gqview-1.0.2-r1.ebuild
+++ b/media-gfx/gqview/gqview-1.0.2-r1.ebuild
@@ -1,12 +1,16 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gqview/gqview-1.0.2-r1.ebuild,v 1.3 2002/07/11 06:30:27 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gqview/gqview-1.0.2-r1.ebuild,v 1.4 2002/07/23 04:33:46 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A GNOME image browser"
 SRC_URI="mirror://sourceforge/gqview/${P}.tar.gz"
 HOMEPAGE="http://gqview.sourceforge.net/"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
 DEPEND="media-libs/libpng
 	>=media-libs/gdk-pixbuf-0.16.0-r4
 	=x11-libs/gtk+-1.2*"
@@ -20,24 +24,13 @@ src_compile() {
 	
 	use nls || myconf="--disable-nls"
 
-	./configure --prefix=/usr				\
-		--mandir=/usr/share/man				\
-		--infodir=/usr/share/info			\
-		--sysconfdir=/etc				\
-		--host=${CHOST}					\
-		${myconf} || die
-
+	econf ${myconf} || die
 	emake || die
 }
 
 src_install() {
 
-	make prefix=${D}/usr					\
-		mandir=${D}/usr/share/man			\
-		infodir=${D}/usr/share/info			\
-		sysconfdir=${D}/etc				\
-		GNOME_DATADIR=${D}/usr/share			\
-		install || die
+	einstall GNOME_DATADIR=${D}/usr/share || die
 	
 	dodoc AUTHORS COPYING ChangeLog README NEWS TODO
 }
diff --git a/media-gfx/gqview/gqview-1.0.2.ebuild b/media-gfx/gqview/gqview-1.0.2.ebuild
deleted file mode 100644
index 75ef40e5b71e..000000000000
--- a/media-gfx/gqview/gqview-1.0.2.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/media-gfx/gqview/gqview-1.0.2.ebuild,v 1.5 2002/07/11 06:30:27 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A GNOME image browser"
-SRC_URI="mirror://sourceforge/gqview/${P}.tar.gz"
-HOMEPAGE="http://gqview.sourceforge.net/"
-
-DEPEND="virtual/glibc
-	media-libs/libpng
-	>=media-libs/gdk-pixbuf-0.16.0-r4
-	=x11-libs/gtk+-1.2*
-	nls? ( sys-devel/gettext )"
-
-
-src_compile() {
-
-	local myconf
-	if [ -z "`use nls`" ] ; then
-		myconf="--disable-nls"
-	fi
-
-	./configure --prefix=/usr				\
-		--mandir=/usr/share/man				\
-		--infodir=/usr/share/info			\
-		--sysconfdir=/etc				\
-		--host=${CHOST}					\
-		${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-
-	make prefix=${D}/usr					\
-		mandir=${D}/usr/share/man			\
-		infodir=${D}/usr/share/info			\
-		sysconfdir=${D}/etc				\
-		GNOME_DATADIR=${D}/usr/share			\
-		install || die
-	
-	dodoc AUTHORS COPYING ChangeLog README NEWS TODO
-}
-
diff --git a/media-gfx/grace/grace-5.1.7-r2.ebuild b/media-gfx/grace/grace-5.1.7-r2.ebuild
index 6cc621ff0011..86124b36fccc 100644
--- a/media-gfx/grace/grace-5.1.7-r2.ebuild
+++ b/media-gfx/grace/grace-5.1.7-r2.ebuild
@@ -1,13 +1,16 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Grant Goodyear <g2boojum@hotmail.com>
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/grace/grace-5.1.7-r2.ebuild,v 1.1 2002/05/20 02:47:58 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/grace/grace-5.1.7-r2.ebuild,v 1.2 2002/07/23 04:33:46 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Grace is a WYSIWYG 2D plotting tool for the X Window System"
 SRC_URI="ftp://plasma-gate.weizmann.ac.il/pub/grace/src/${P}.tar.gz"
 HOMEPAGE="http://plasma-gate.weizmann.ac.il/Grace/"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
 DEPEND="virtual/x11
 	>=x11-libs/openmotif-2.1
 	media-libs/libpng
@@ -22,35 +25,34 @@ src_compile() {
 	
 	use pdflib || myconf="--disable-pdfdrv"
 	
-	./configure --with-grace-home=/usr/share/grace			\
-		--prefix=/usr						\
-		--host=${CHOST}						\
+	econf \
+		--with-grace-home=/usr/share/grace \
 		${myconf} || die
 	
 	cp doc/Makefile doc/Makefile.orig
-	sed -e 's:$(GRACE_HOME)/doc:$(PREFIX)/share/doc/$(PF)/html:g'	\
+	sed -e 's:$(GRACE_HOME)/doc:$(PREFIX)/share/doc/$(PF)/html:g' \
 		doc/Makefile.orig >doc/Makefile || die
 
 	cp auxiliary/Makefile auxiliary/Makefile.orig
-	sed -e 's:$(GRACE_HOME)/bin:$(PREFIX)/bin:g'			\
+	sed -e 's:$(GRACE_HOME)/bin:$(PREFIX)/bin:g' \
 		auxiliary/Makefile.orig >auxiliary/Makefile || die
 
 	cp grconvert/Makefile grconvert/Makefile.orig
-	sed -e 's:$(GRACE_HOME)/bin:$(PREFIX)/bin:g'			\
+	sed -e 's:$(GRACE_HOME)/bin:$(PREFIX)/bin:g' \
 		grconvert/Makefile.orig >grconvert/Makefile || die
 
 	cp src/Makefile src/Makefile.orig
-	sed -e 's:$(GRACE_HOME)/bin:$(PREFIX)/bin:g'			\
+	sed -e 's:$(GRACE_HOME)/bin:$(PREFIX)/bin:g' \
 		src/Makefile.orig >src/Makefile || die
 
 	cp grace_np/Makefile grace_np/Makefile.orig
-	sed -e 's:$(GRACE_HOME)/lib:$(PREFIX)/lib:g'			\
-		-e 's:$(GRACE_HOME)/include:$(PREFIX)/include:g'	\
+	sed -e 's:$(GRACE_HOME)/lib:$(PREFIX)/lib:g' \
+		-e 's:$(GRACE_HOME)/include:$(PREFIX)/include:g' \
 		grace_np/Makefile.orig >grace_np/Makefile || die
 
 	cp examples/Makefile examples/Makefile.orig
-	sed -e 's:/examples:/share/doc/$(PF)/examples:g'		\
-		-e 's:$(GRACE_HOME):$(PREFIX):g'			\
+	sed -e 's:/examples:/share/doc/$(PF)/examples:g' \
+		-e 's:$(GRACE_HOME):$(PREFIX):g' \
 		examples/Makefile.orig >examples/Makefile || die
 
 	make || die
@@ -58,16 +60,17 @@ src_compile() {
 
 src_install() {
 
-	make GRACE_HOME=${D}/usr/share/grace				\
-		PREFIX=${D}/usr						\
+	make GRACE_HOME=${D}/usr/share/grace \
+		PREFIX=${D}/usr \
     		install || die
 
 	dodoc CHANGES COPYRIGHT ChangeLog DEVELOPERS LICENSE README
 
-	dodir /usr/share/man/man1
-	mv ${D}/usr/share/doc/${PF}/html/*.1 ${D}/usr/share/man/man1
+	#dodir /usr/share/man/man1
+	#mv ${D}/usr/share/doc/${PF}/html/*.1 ${D}/usr/share/man/man1
+	doman ${D}/usr/share/doc/${PF}/html/*.1
+	rm -f ${D}/usr/share/doc/${PF}/html/*.1
     
 	insinto /etc/env.d
 	doins ${FILESDIR}/10grace
 }
-
diff --git a/media-gfx/graphviz/files/digest-graphviz-1.7.15-r1 b/media-gfx/graphviz/files/digest-graphviz-1.7.15-r1
deleted file mode 100644
index ee826cc2fc41..000000000000
--- a/media-gfx/graphviz/files/digest-graphviz-1.7.15-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 067848c829d159be81cbca8607ac7f30 graphviz-1.7.15.tgz 6032137
diff --git a/media-gfx/graphviz/graphviz-1.7.15-r1.ebuild b/media-gfx/graphviz/graphviz-1.7.15-r1.ebuild
deleted file mode 100644
index 5018689f73a8..000000000000
--- a/media-gfx/graphviz/graphviz-1.7.15-r1.ebuild
+++ /dev/null
@@ -1,49 +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/media-gfx/graphviz/graphviz-1.7.15-r1.ebuild,v 1.3 2002/07/11 06:30:27 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="open source graph drawing software"
-SRC_URI="http://www.research.att.com/sw/tools/graphviz/dist/$P.tgz"
-HOMEPAGE="http://www.research.att.com/sw/tools/graphviz/"
-
-#Can use freetype-1.3 or 2.0, but not both
-DEPEND=">=sys-libs/zlib-1.1.3
-	>=media-libs/libpng-1.0.6
-	>=media-libs/jpeg-6b
-	media-libs/freetype
-	tcltk? ( =dev-lang/tk-8.3* )"
-
-src_compile() {
-
-	local myconf
-	#if no tcltk, this will generate configure warnings, but will
-	#compile without tcltk support
-	use tcltk || myconf="$myconf --without-tcl --without-tk"
-
-	#They seem to have forgot configure when packaging 1.7.15
-	./autogen.sh --infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--prefix=/usr \
-		--host=${CHOST} \
-		${myconf} || die
-
-    make || die
-	
-}
-
-src_install () {
-   
-   make DESTDIR=${D} install || die
-
-	dodoc AUTHORS ChangeLog FAQ.txt INSTALL  MINTERMS.txt \
-		NEWS README 
-	
-	insinto /usr/share/doc/${P}/html
-	doins LICENSE.html doc/*.html 
-	
-	
-	insinto /usr/share/doc/${P}/pdf
-	doins doc/*.pdf
-		
-}
diff --git a/media-gfx/graphviz/graphviz-1.7.15-r2.ebuild b/media-gfx/graphviz/graphviz-1.7.15-r2.ebuild
index aae2930cb473..aa9525b31a45 100644
--- a/media-gfx/graphviz/graphviz-1.7.15-r2.ebuild
+++ b/media-gfx/graphviz/graphviz-1.7.15-r2.ebuild
@@ -1,12 +1,16 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-1.7.15-r2.ebuild,v 1.3 2002/07/11 06:30:27 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-1.7.15-r2.ebuild,v 1.4 2002/07/23 04:33:46 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="open source graph drawing software"
 SRC_URI="http://www.research.att.com/sw/tools/graphviz/dist/$P.tgz"
 HOMEPAGE="http://www.research.att.com/sw/tools/graphviz/"
 
+SLOT="0"
+LICENSE="as-is | ATT"
+KEYWORDS="x86"
+
 #Can use freetype-1.3 or 2.0, but not both
 DEPEND=">=sys-libs/zlib-1.1.3
 	media-libs/libpng
@@ -19,7 +23,7 @@ src_compile() {
 	local myconf
 	#if no tcltk, this will generate configure warnings, but will
 	#compile without tcltk support
-	use tcltk || myconf="$myconf --without-tcl --without-tk"
+	use tcltk || myconf="${myconf} --without-tcl --without-tk"
 
 	#They seem to have forgot configure when packaging 1.7.15
 	./autogen.sh --infodir=/usr/share/info \
@@ -34,16 +38,12 @@ src_compile() {
 
 src_install () {
    
-   make DESTDIR=${D} install || die
+	make DESTDIR=${D} install || die
 
 	dodoc AUTHORS ChangeLog FAQ.txt INSTALL  MINTERMS.txt \
 		NEWS README 
 	
-	insinto /usr/share/doc/${P}/html
-	doins LICENSE.html doc/*.html 
-	
-	
-	insinto /usr/share/doc/${P}/pdf
-	doins doc/*.pdf
+	dohtml -r .
+	dodoc doc/*.pdf
 		
 }
diff --git a/media-gfx/gthumb/files/digest-gthumb-1.102 b/media-gfx/gthumb/files/digest-gthumb-1.102
deleted file mode 100644
index d694e8e1452f..000000000000
--- a/media-gfx/gthumb/files/digest-gthumb-1.102
+++ /dev/null
@@ -1 +0,0 @@
-MD5 da1aefe1581a5952b6ae5993ff3daaaa gthumb-1.102.tar.gz 604779
diff --git a/media-gfx/gthumb/gthumb-0.13.ebuild b/media-gfx/gthumb/gthumb-0.13.ebuild
index 29dd47b41599..94a99f53021e 100644
--- a/media-gfx/gthumb/gthumb-0.13.ebuild
+++ b/media-gfx/gthumb/gthumb-0.13.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-0.13.ebuild,v 1.1 2002/07/16 19:56:15 stroke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-0.13.ebuild,v 1.2 2002/07/23 04:33:46 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="gthumb is an Image Viewer and Browser for Gnome."
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://gthumb.sourceforge.net/"
+
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86"
@@ -16,30 +17,24 @@ DEPEND=">=media-libs/gdk-pixbuf-0.11.0-r1
 	>=dev-libs/libxml-1.8.15
 	>=gnome-base/bonobo-1.0.9-r1
 	>=gnome-base/gnome-libs-1.4.1.7
-	( >=gnome-base/libglade-0.17-r1
-	 <gnome-base/libglade-2.0.0 )"
+	=gnome-base/libglade-0*"
 
 
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	nls? ( sys-devel/gettext )"
 
 src_compile() {
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--sysconfdir=/etc \
-		--localstatedir=/var/lib || die
 
+	local myconf
+
+	use nls || myconf="${myconf} --disable-nls"
+
+	econf ${myconf} || die
 	emake || die
 }
 
 src_install () {
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		sysconfdir=${D}/etc \
-		localstatedir=${D}/var/lib \
-	install || die
+	einstall || die
 
 	dodoc AUTHORS COPYING ChangeLog NEWS README TODO
 
diff --git a/media-gfx/gthumb/gthumb-1.102-r1.ebuild b/media-gfx/gthumb/gthumb-1.102-r1.ebuild
index 03e5e8c26207..51fec038dd86 100644
--- a/media-gfx/gthumb/gthumb-1.102-r1.ebuild
+++ b/media-gfx/gthumb/gthumb-1.102-r1.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-1.102-r1.ebuild,v 1.1 2002/07/18 19:39:51 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-1.102-r1.ebuild,v 1.2 2002/07/23 04:33:46 seemant Exp $
 
 inherit gnome2
 
 S=${WORKDIR}/${P}
-SLOT="0"
 DESCRIPTION="gthumb is an Image Viewer and Browser for Gnome."
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://gthumb.sourceforge.net/"
+
+SLOT="1"
 LICENSE="GPL-2"
 KEYWORDS="x86 ppc"
 
diff --git a/media-gfx/gthumb/gthumb-1.102.ebuild b/media-gfx/gthumb/gthumb-1.102.ebuild
deleted file mode 100644
index 1cb0c4cd8176..000000000000
--- a/media-gfx/gthumb/gthumb-1.102.ebuild
+++ /dev/null
@@ -1,64 +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/media-gfx/gthumb/gthumb-1.102.ebuild,v 1.1 2002/07/16 19:56:15 stroke Exp $
-
-
-# Do _NOT_ strip symbols in the build! Need both lines for Portage 1.8.9+
-DEBUG="yes"
-RESTRICT="nostrip"
-# force debug information
-CFLAGS="${CFLAGS} -g"
-CXXFLAGS="${CXXFLAGS} -g"
-
-
-S=${WORKDIR}/${P}
-SLOT="0"
-DESCRIPTION="gthumb is an Image Viewer and Browser for Gnome."
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://gthumb.sourceforge.net/"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-
-RDEPEND=">=dev-libs/glib-2.0.4
-	>=x11-libs/gtk+-2.0.5
-	>=dev-libs/libxml2-2.4.22
-	>=gnome-base/libgnome-2.0.0
-	>=gnome-base/libgnomeui-2.0.0
-	>=gnome-base/libgnomecanvas-2.0.0
-	>=gnome-base/gnome-vfs-2.0.0
-	>=gnome-base/libglade-2.0.0
-	>=gnome-base/libgnomeprint-1.115.0
-	>=gnome-base/libgnomeprintui-1.115.0
-	>=gnome-base/bonobo-activation-1.0.0
-	>=gnome-base/libbonobo-2.0.0
-	>=gnome-base/libbonoboui-2.0.0
-	>=media-libs/libpng-1.2.4"
-
-
-DEPEND=">=dev-util/pkgconfig-0.12.0
-	${RDEPEND}"
-
-src_compile() {
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--sysconfdir=/etc \
-		--localstatedir=/var/lib || die
-
-	emake || die
-}
-
-src_install () {
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		sysconfdir=${D}/etc \
-		localstatedir=${D}/var/lib \
-	install || die
-
-	dodoc AUTHORS COPYING ChangeLog NEWS README TODO
-
-	doman ${S}/doc/gthumb.1 
-}
diff --git a/media-gfx/gtkam/gtkam-0.1.4.ebuild b/media-gfx/gtkam/gtkam-0.1.4.ebuild
index dc9ac799dc44..94d1f260a28e 100644
--- a/media-gfx/gtkam/gtkam-0.1.4.ebuild
+++ b/media-gfx/gtkam/gtkam-0.1.4.ebuild
@@ -1,43 +1,31 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/gtkam-0.1.4.ebuild,v 1.1 2002/06/01 21:03:30 stroke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/gtkam-0.1.4.ebuild,v 1.2 2002/07/23 04:33:46 seemant Exp $
 
+S=${WORKDIR}/${P}
 DESCRIPTION="A frontend for gPhoto 2"
 HOMEPAGE="http://gphoto.org/gphoto2/gtk.html"
-LICENSE="GPL-2"
-
-SRC_URI="http://telia.dl.sourceforge.net/sourceforge/gphoto/${P}.tar.gz
-	http://unc.dl.sourceforge.net/sourceforge/gphoto/${P}.tar.gz
-	http://belnet.dl.sourceforge.net/sourceforge/gphoto/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/gphoto/${P}.tar.gz"
 
 SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
 
 DEPEND=">=x11-libs/gtk+-1.2.10-r7
 	>=media-libs/gdk-pixbuf-0.17.0
 	>=media-gfx/gphoto2-2.0-r1"
-RDEPEND="${DEPEND}"
 
+RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${P}
 
 src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--without-gimp || die
-
+	econf --without-gimp || die
 	emake || die
 }
 
 src_install () {
 
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
+	einstall || die
 
 	dodoc ABOUT-NLS AUTHORS COPYING INSTALL MANUAL NEWS README
 }
diff --git a/media-gfx/gtksee/gtksee-0.5.0.ebuild b/media-gfx/gtksee/gtksee-0.5.0.ebuild
index cb06f4fe6acf..91e8e149d1fe 100644
--- a/media-gfx/gtksee/gtksee-0.5.0.ebuild
+++ b/media-gfx/gtksee/gtksee-0.5.0.ebuild
@@ -1,42 +1,31 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtksee/gtksee-0.5.0.ebuild,v 1.3 2002/07/11 10:14:51 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtksee/gtksee-0.5.0.ebuild,v 1.4 2002/07/23 04:33:46 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A simple but functional image viewer/browser - ACD See alike."
 HOMEPAGE="http://www.unmaintained-free-software.org/showproject.php?id=181"
 SRC_URI="http://village.flashnet.it/users/fn048069/files/srctars/${P}.tar.gz"
 
-
-LICENSE="GPL-2"
 SLOT="0"
+LICENSE="GPL-2"
 KEYWORDS="x86"
 
 DEPEND="=x11-libs/gtk+-1.2*
-		jpeg? ( media-libs/jpeg )
-		tiff? ( media-libs/tiff )
-		png? ( >=media-libs/libpng-1.2.1 )"
+	jpeg? ( media-libs/jpeg )
+	tiff? ( media-libs/tiff )
+	png? ( >=media-libs/libpng-1.2.1 )"
 
 src_compile() {
 
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die
-
+	econf || die
 	emake || die
 
 }
 
 src_install () {
 
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
-
+	einstall || die
 	dodoc ABOUT-NLS AUTHORS ChangeLog COPYING INSTALL NEWS README TODO
 
 }
diff --git a/media-gfx/gwenview/gwenview-0.14.0.ebuild b/media-gfx/gwenview/gwenview-0.14.0.ebuild
index 8e44ae6caad0..ddafe4627fc1 100644
--- a/media-gfx/gwenview/gwenview-0.14.0.ebuild
+++ b/media-gfx/gwenview/gwenview-0.14.0.ebuild
@@ -1,13 +1,16 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gwenview/gwenview-0.14.0.ebuild,v 1.2 2002/07/01 21:33:31 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gwenview/gwenview-0.14.0.ebuild,v 1.3 2002/07/23 04:33:46 seemant Exp $
 inherit kde-base
 
 DESCRIPTION="Gwenview is an image viewer for KDE"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 HOMEPAGE="http://gwenview.sourceforge.net/"
+
+SLOT="0"
 LICENSE="GPL-2"
+KEYWORDS="x86"
+
 newdepend ">=kde-base/kdebase-3.0"
 
 need-kde 3
-