version bump and cleanups

6 files changed, 72 insertions, 85 deletions

diff --git a/media-gfx/xfig/ChangeLog b/media-gfx/xfig/ChangeLog
index e5e725b7db95..5ba41685fbb3 100644
--- a/media-gfx/xfig/ChangeLog
+++ b/media-gfx/xfig/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/xfig
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/ChangeLog,v 1.6 2003/02/12 07:04:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/ChangeLog,v 1.7 2003/02/12 11:50:54 seemant Exp $
+
+*xfig-3.2.4 (12 Feb 2003)
+
+  12 Feb 2003; Seemant Kulleen <seemant@gentoo.org> xfig-3.2.4.ebuild :
+
+  Version bump thanks to: Daniele Foci <sunscan@sunscan.org> in bug
+  #14245.  Also, removed the patch from files and sent it to the mirrors,
+  and using epatch from eutils.eclass to handle the patching.
 
 *xfig-3.2.3d-r1 (13 Apr 2002)
 
diff --git a/media-gfx/xfig/files/digest-xfig-3.2.3d-r1 b/media-gfx/xfig/files/digest-xfig-3.2.3d-r1
index a8f283652ca8..b3cec4197c77 100644
--- a/media-gfx/xfig/files/digest-xfig-3.2.3d-r1
+++ b/media-gfx/xfig/files/digest-xfig-3.2.3d-r1
@@ -1 +1,2 @@
 MD5 c6321efc1e2796e111b250c58de2f2e0 xfig.3.2.3d.full.tar.gz 2846844
+MD5 470c77215665a3171ddf69bc394e26ea xfig-3.2.3d-gentoo.diff.bz2 1153
diff --git a/media-gfx/xfig/files/digest-xfig-3.2.4 b/media-gfx/xfig/files/digest-xfig-3.2.4
new file mode 100644
index 000000000000..d7a2b37341b9
--- /dev/null
+++ b/media-gfx/xfig/files/digest-xfig-3.2.4
@@ -0,0 +1,2 @@
+MD5 1911fc0f733cb2f40336a8d0e82513de xfig.3.2.4.full.tar.gz 5163150
+MD5 fbc5f9f480651bcfb189e95a642f3fe0 xfig-3.2.4-gentoo.diff.bz2 1001
diff --git a/media-gfx/xfig/files/xfig-3.2.3d.patch b/media-gfx/xfig/files/xfig-3.2.3d.patch
deleted file mode 100644
index 0150eaef08ce..000000000000
--- a/media-gfx/xfig/files/xfig-3.2.3d.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- xfig.3.2.3d.orig/Imakefile	Tue May 29 13:32:11 2001
-+++ xfig.3.2.3d/Imakefile	Thu Jun 21 22:57:52 2001
-@@ -26,9 +26,9 @@
- XCOMM app-defaults resource files to go.  You will have to use the environment
- XCOMM variable XAPPLRESDIR to point to this directory.
- 
--XCOMM BINDIR = /usr/bin/X11
-+XCOMM BINDIR = /usr/X11/bin
- XCOMM MKDIRHIER = /bin/sh /usr/bin/X11/mkdirhier
--XCOMM XAPPLOADDIR = /home/user/xfig
-+XAPPLOADDIR = /etc/X11/app-defaults
- 
- XCOMM If don't want JPEG support, comment out the #define USEJPEG line
- XCOMM Uncomment the #define for USEJPEG if you want to be able to import
-@@ -47,8 +47,8 @@
- 
- #ifdef USEJPEG
- #ifdef USEINSTALLEDJPEG
--JPEGLIBDIR = /usr/local/lib
--JPEGINCDIR = /usr/include/X11
-+JPEGLIBDIR = /usr/lib
-+JPEGINCDIR = /usr/include
- #else
- JPEGLIBDIR = ../jpeg
- JPEGINCDIR = $(JPEGLIBDIR)
-@@ -72,8 +72,8 @@
- XCOMM Change XPMLIBDIR if necessary to point to the xpm library (libXpm)
- XCOMM Change XPMINC if necessary to point to the include file for xpm (xpm.h)
- 
--XCOMM #define USEXPM
--XCOMM #define USEXPM_ICON
-+#define USEXPM
-+#define USEXPM_ICON
- 
- #ifdef USEXPM
- XPMLIBDIR = $(USRLIBDIR)
-@@ -90,7 +90,7 @@
- XCOMM Then be sure to change the XAW3DINC to point to the directory where your
- XCOMM 3D Athena widget headers are located
- 
--#define XAW3D
-+XCOMM #define XAW3D
- 
- #ifdef XAW3D
- XAW3DINC = -I/usr/include/X11/Xaw3d
-@@ -120,7 +120,7 @@
- XCOMM If your setlocale() dosen't support the locale, you should
- XCOMM add -DSETLOCALE to I18N_DEFS.
- 
--XCOMM #define I18N
-+#define I18N
- 
- XCOMM If using an input tablet uncomment the following
- 
-@@ -131,19 +131,19 @@
- XCOMM inline functions. With the "INLINE" keyword, you should notice that
- XCOMM the display will be a bit faster in complex figures
- 
--XCOMM USEINLINE = -DUSE_INLINE
-+USEINLINE = -DUSE_INLINE
- 
- XCOMM use (and change) the following if you want the multi-key data base file
- XCOMM somewhere other than the standard X11 library directory
- XCOMM be sure to comment out the second copy of XFIGLIBDIR if you use this one
--XCOMM XFIGLIBDIR = /usr/local/lib/xfig
-+XFIGLIBDIR = /usr/X11R6/lib/xfig
- 
- XCOMM use this if you want the multi-key data base file in the standard X11 tree
--XFIGLIBDIR = $(LIBDIR)/xfig
-+XCOMM XFIGLIBDIR = $(LIBDIR)/xfig
- 
- XCOMM now you can configure where the documentation should be located
--XFIGDOCDIR = $(LIBDIR)/xfig
--XCOMM XFIGDOCDIR = /usr/share/doc/xfig-doc
-+XCOMM XFIGDOCDIR = $(LIBDIR)/xfig
-+XFIGDOCDIR = /usr/share/doc/xfig-3.2.3d
- 
- XCOMM If your system doesn't have strstr undefine the following definition
- XCOMM HAVE_NO_NOSTRSTR = -DNOSTRSTR
diff --git a/media-gfx/xfig/xfig-3.2.3d-r1.ebuild b/media-gfx/xfig/xfig-3.2.3d-r1.ebuild
index affd892c6a49..0e2c58db74fc 100644
--- a/media-gfx/xfig/xfig-3.2.3d-r1.ebuild
+++ b/media-gfx/xfig/xfig-3.2.3d-r1.ebuild
@@ -1,14 +1,17 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/xfig-3.2.3d-r1.ebuild,v 1.7 2003/01/08 03:26:59 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/xfig-3.2.3d-r1.ebuild,v 1.8 2003/02/12 11:50:54 seemant Exp $
+
+inherit eutils
 
 IUSE=""
 
-MY_P=${P/xfig-/xfig.}
+MY_P=${PN}.${PV}
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="A menu-driven tool to draw and manipulate objects interactively in an X window."
-SRC_URI="http://www.xfig.org/xfigdist/${MY_P}.full.tar.gz"
 HOMEPAGE="http://www.xfig.org"
+SRC_URI="http://www.xfig.org/xfigdist/${MY_P}.full.tar.gz
+	mirror://gentoo/${P}-gentoo.diff.bz2"
 
 SLOT="0"
 LICENSE="BSD"
@@ -25,7 +28,7 @@ RDEPEND="${DEPEND}
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	patch -p1 < ${FILESDIR}/${P}.patch
+	epatch ${WORKDIR}/${P}-gentoo.diff
 }
 
 src_compile() {
diff --git a/media-gfx/xfig/xfig-3.2.4.ebuild b/media-gfx/xfig/xfig-3.2.4.ebuild
new file mode 100644
index 000000000000..44b0ae0a1a96
--- /dev/null
+++ b/media-gfx/xfig/xfig-3.2.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2.
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/xfig-3.2.4.ebuild,v 1.1 2003/02/12 11:50:54 seemant Exp $
+
+inherit eutils
+
+IUSE=""
+
+MY_P=${PN}.${PV}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="A menu-driven tool to draw and manipulate objects interactively in an X window."
+HOMEPAGE="http://www.xfig.org"
+SRC_URI="http://www.xfig.org/xfigdist/${MY_P}.full.tar.gz
+	mirror://gentoo/${P}-gentoo.diff.bz2"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~x86 ~ppc"
+
+DEPEND="virtual/x11
+	x11-libs/Xaw3d
+	media-libs/jpeg
+	media-libs/libpng"
+
+RDEPEND="${DEPEND}
+	media-gfx/transfig
+	media-libs/netpbm"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${WORKDIR}/${P}-gentoo.diff
+}
+
+src_compile() {
+	xmkmf || die
+	make || die
+}
+
+src_install () {
+	make \
+		DESTDIR=${D} \
+		install || die
+
+	make \
+		DESTDIR=${D} \
+		MANDIR=/usr/share/man/man1 \
+		MANSUFFIX=1 \
+		install.all || die
+
+	dodoc README FIGAPPS CHANGES LATEX.AND.XFIG
+}