cleanup

3 files changed, 16 insertions, 65 deletions

diff --git a/app-misc/gfontview/files/digest-gfontview-0.5.0-r1 b/app-misc/gfontview/files/digest-gfontview-0.5.0-r1
deleted file mode 100644
index 471d164931b4..000000000000
--- a/app-misc/gfontview/files/digest-gfontview-0.5.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f06e0e9d67f7d8b3af251fa593e83eeb gfontview-0.5.0.tar.gz 207053
diff --git a/app-misc/gfontview/gfontview-0.5.0-r1.ebuild b/app-misc/gfontview/gfontview-0.5.0-r1.ebuild
deleted file mode 100644
index c1398d85e885..000000000000
--- a/app-misc/gfontview/gfontview-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gfontview/gfontview-0.5.0-r1.ebuild,v 1.1 2001/10/06 12:36:36 azarah Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="Fontviewer for PostScript Tpe 1 and TrueType"
-SRC_URI="http://download.sourceforge.net/gfontview/"${A}
-HOMEPAGE="http://gfontview.sourceforge.net"
-
-DEPEND="virtual/glibc
-	>=sys-devel/gcc-2.95
-	=media-libs/freetype-1.3.1-r2
-	>=media-libs/t1lib-1.0.1
-	>=x11-libs/gtk+-1.2.10-r4
-	virtual/lpr
-	nls? ( sys-devel/gettext )
-	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )"
-
-
-src_compile() {
-
-  local myconf
-  if [ -z "`use nls`" ]
-  then
-    myconf="--disable-nls"
-  fi
-  try ./configure --host=${CHOST} --prefix=/usr $myconf
-  try make
-}
-
-src_install() {
-  try make prefix=${D}/usr install
-  dodoc AUTHORS COPYING ChangeLog NEWS README TODO
-  insinto /usr/X11R6/include/X11/pixmaps/
-  doins error.xpm openhand.xpm font.xpm t1.xpm tt.xpm 
-}
-
-
-
diff --git a/app-misc/gfontview/gfontview-0.5.0-r2.ebuild b/app-misc/gfontview/gfontview-0.5.0-r2.ebuild
index 0663e081e212..35f5adcd3292 100644
--- a/app-misc/gfontview/gfontview-0.5.0-r2.ebuild
+++ b/app-misc/gfontview/gfontview-0.5.0-r2.ebuild
@@ -1,41 +1,34 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gfontview/gfontview-0.5.0-r2.ebuild,v 1.1 2002/01/14 07:51:23 hallski Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gfontview/gfontview-0.5.0-r2.ebuild,v 1.2 2002/04/28 02:37:31 seemant Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Fontviewer for PostScript Tpe 1 and TrueType"
-SRC_URI="http://download.sourceforge.net/gfontview/"${A}
+SRC_URI="http://download.sourceforge.net/gfontview/${P}.tar.gz"
 HOMEPAGE="http://gfontview.sourceforge.net"
 
-DEPEND="virtual/glibc
-	>=sys-devel/gcc-2.95
-	~media-libs/freetype-1.3.1
-	>=media-libs/t1lib-1.0.1
-	>=x11-libs/gtk+-1.2.10-r4
+DEPEND=">=media-libs/t1lib-1.0.1
+	=media-libs/freetype-1*
+	=x11-libs/gtk+-1.2*
 	virtual/lpr
-	nls? ( sys-devel/gettext )
 	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )"
 
+RDEPEND="nls? ( sys-devel/gettext )"
+	
 
 src_compile() {
 
-  local myconf
-  if [ -z "`use nls`" ]
-  then
-    myconf="--disable-nls"
-  fi
-  try ./configure --host=${CHOST} --prefix=/usr $myconf
-  try make
+	local myconf
+	use nls || myconf="--disable-nls"
+	
+	econf ${myconf} || die
+	make || die
 }
 
 src_install() {
-  try make prefix=${D}/usr install
-  dodoc AUTHORS COPYING ChangeLog NEWS README TODO
-  insinto /usr/X11R6/include/X11/pixmaps/
-  doins error.xpm openhand.xpm font.xpm t1.xpm tt.xpm 
+	make prefix=${D}/usr install || die
+	dodoc AUTHORS COPYING ChangeLog NEWS README TODO
+	insinto /usr/X11R6/include/X11/pixmaps/
+	doins error.xpm openhand.xpm font.xpm t1.xpm tt.xpm 
 }
-
-
-