version bump 3.2.5_alpha5, bug 71205

(Portage version: 2.0.52-r1)

11 files changed, 145 insertions, 106 deletions

diff --git a/media-gfx/xfig/ChangeLog b/media-gfx/xfig/ChangeLog
index 2daf6d38d118..6d0a9a444078 100644
--- a/media-gfx/xfig/ChangeLog
+++ b/media-gfx/xfig/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-gfx/xfig
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/ChangeLog,v 1.18 2005/09/13 17:36:11 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/ChangeLog,v 1.19 2005/09/24 21:31:55 vanquirius Exp $
+
+*xfig-3.2.5_alpha5 (24 Sep 2005)
+
+  24 Sep 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +files/xfig-3.2.5_alpha5-gentoo.diff, +files/xfig-3.2.5_alpha5-xaw3d.diff,
+  +metadata.xml, -xfig-3.2.3d-r1.ebuild, -xfig-3.2.4.ebuild,
+  +xfig-3.2.5_alpha5.ebuild:
+  Version bump for bug 71205, thanks to Cristian Peraferrer <corellian at
+  interec dot org>. Ported gentoo and xaw3d patches, shape patch is integrated
+  upstream.
 
   13 Sep 2005; Aron Griffis <agriffis@gentoo.org> xfig-3.2.4-r2.ebuild:
   Mark 3.2.4-r2 stable on alpha
diff --git a/media-gfx/xfig/Manifest b/media-gfx/xfig/Manifest
index 12e87d77d7ab..1cc2e19b5b43 100644
--- a/media-gfx/xfig/Manifest
+++ b/media-gfx/xfig/Manifest
@@ -1,10 +1,10 @@
-MD5 a2aabadab014d74810919f9075894f62 xfig-3.2.4.ebuild 993
-MD5 30c214db91d259e900ac0aa3402ae157 xfig-3.2.3d-r1.ebuild 981
-MD5 5b8d53735fbc2457bb3aaa1dd3b3d23c ChangeLog 2808
 MD5 c90f05f166f78646da5cda62db8f7c45 xfig-3.2.4-r2.ebuild 1382
+MD5 4897bd5e04c10def753640b387365f4b xfig-3.2.5_alpha5.ebuild 1196
 MD5 05da0d580f50e46c60ddb6c915310a51 xfig-3.2.4-r1.ebuild 1063
-MD5 2040447ee9c5d221fb0ec342afa1085c files/digest-xfig-3.2.3d-r1 139
-MD5 410ddf8ebcca6c2714f820d737f136c0 files/digest-xfig-3.2.4-r1 137
+MD5 5b8d53735fbc2457bb3aaa1dd3b3d23c ChangeLog 2808
 MD5 1d27cd35de86081aa824a8f837f14745 files/xfig-3.2.4-xaw3d.diff 465
-MD5 410ddf8ebcca6c2714f820d737f136c0 files/digest-xfig-3.2.4 137
+MD5 b30d1a2b0c6ce802248a2605e13356df files/digest-xfig-3.2.5_alpha5 75
+MD5 beb83fd8cd3423aeffdc3858a633852d files/xfig-3.2.5_alpha5-gentoo.diff 2110
+MD5 410ddf8ebcca6c2714f820d737f136c0 files/digest-xfig-3.2.4-r1 137
 MD5 4b1ad5e5e2087452ce25723ececb2708 files/digest-xfig-3.2.4-r2 215
+MD5 65da21fda4fd5353fa3d7f421982af99 files/xfig-3.2.5_alpha5-xaw3d.diff 456
diff --git a/media-gfx/xfig/files/digest-xfig-3.2.3d-r1 b/media-gfx/xfig/files/digest-xfig-3.2.3d-r1
deleted file mode 100644
index b3cec4197c77..000000000000
--- a/media-gfx/xfig/files/digest-xfig-3.2.3d-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index d7a2b37341b9..000000000000
--- a/media-gfx/xfig/files/digest-xfig-3.2.4
+++ /dev/null
@@ -1,2 +0,0 @@
-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/digest-xfig-3.2.5_alpha5 b/media-gfx/xfig/files/digest-xfig-3.2.5_alpha5
new file mode 100644
index 000000000000..9e7ffed83c7f
--- /dev/null
+++ b/media-gfx/xfig/files/digest-xfig-3.2.5_alpha5
@@ -0,0 +1 @@
+MD5 7547b66232569e3c12e4a0639bd92629 xfig.3.2.5-alpha5.full.tar.gz 5836544
diff --git a/media-gfx/xfig/files/xfig-3.2.5_alpha5-gentoo.diff b/media-gfx/xfig/files/xfig-3.2.5_alpha5-gentoo.diff
new file mode 100644
index 000000000000..fb39d5ee4909
--- /dev/null
+++ b/media-gfx/xfig/files/xfig-3.2.5_alpha5-gentoo.diff
@@ -0,0 +1,55 @@
+--- xfig.3.2.5-alpha5.orig/Imakefile	2005-09-24 17:56:13.000000000 -0300
++++ xfig.3.2.5-alpha5/Imakefile	2005-09-24 18:00:24.000000000 -0300
+@@ -30,7 +30,7 @@
+ XCOMM Also, you may have to uncomment and redefine MKDIRHIER because "make" looks
+ XCOMM for it relative to the BINDIR variable.
+ XCOMM
+-XCOMM BINDIR = /usr/bin/X11
++XCOMM BINDIR = /usr/X11/bin
+ XCOMM MKDIRHIER = /bin/sh /usr/bin/X11/mkdirhier -p
+ 
+ XCOMM Uncomment and change XAPPLOADDIR to the directory where you want the
+@@ -44,7 +44,7 @@
+ XCOMM different tree than the "correct" tree that your X system expects. The usual
+ XCOMM purpose of DESTDIR is to test an install process by installing in a benign area.
+ 
+-XCOMM XAPPLOADDIR = /home/user/xfig
++XAPPLOADDIR = /etc/X11/app-defaults
+ 
+ XCOMM Uncomment the following definition for XAW3D if you want to use
+ XCOMM the 3d Athena Widget Set (highly recommended!)
+@@ -92,8 +92,8 @@
+ 
+ #ifdef USEJPEG
+ #ifdef USEINSTALLEDJPEG
+-JPEGLIBDIR = /usr/local/lib
+-JPEGINC = -I/usr/include/X11
++JPEGLIBDIR = /usr/lib
++JPEGINC = -I/usr/include
+ #else
+ JPEGLIBDIR = ../jpeg
+ JPEGINC = -I$(JPEGLIBDIR)
+@@ -157,19 +157,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 XFIGDOCDIR tells where the html and pdf documentation should go
+ XCOMM XFIGDOCDIR = $(DOCDIR)/xfig
+-XFIGDOCDIR = /usr/share/doc/xfig
++XFIGDOCDIR = /usr/share/doc/xfig-3.2.5
+ 
+ XCOMM MANDIR tells where the standard man pages should go (no need to change it
+ XCOMM if you want the man pages installed in the standard place on your system
diff --git a/media-gfx/xfig/files/xfig-3.2.5_alpha5-xaw3d.diff b/media-gfx/xfig/files/xfig-3.2.5_alpha5-xaw3d.diff
new file mode 100644
index 000000000000..25674d42ecbc
--- /dev/null
+++ b/media-gfx/xfig/files/xfig-3.2.5_alpha5-xaw3d.diff
@@ -0,0 +1,11 @@
+--- Imakefile.orig	2005-09-24 18:07:43.000000000 -0300
++++ Imakefile	2005-09-24 18:08:08.000000000 -0300
+@@ -49,7 +49,7 @@
+ XCOMM Uncomment the following definition for XAW3D if you want to use
+ XCOMM the 3d Athena Widget Set (highly recommended!)
+ 
+-XCOMM #define XAW3D
++#define XAW3D
+ 
+ XCOMM Uncomment the following if you have David Hawkey's Xaw3D version 1.5E which has
+ XCOMM some new features, including "Tips", which replace xfig's "help balloons"
diff --git a/media-gfx/xfig/metadata.xml b/media-gfx/xfig/metadata.xml
new file mode 100644
index 000000000000..d8b96be3c5cd
--- /dev/null
+++ b/media-gfx/xfig/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>bug-wranglers@gentoo.org</email>
+		<description>This package lacks a primary herd or maintainer.</description>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-gfx/xfig/xfig-3.2.3d-r1.ebuild b/media-gfx/xfig/xfig-3.2.3d-r1.ebuild
deleted file mode 100644
index bf854f49359a..000000000000
--- a/media-gfx/xfig/xfig-3.2.3d-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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.12 2004/07/14 18:33:19 agriffis Exp $
-
-inherit eutils
-
-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"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE=""
-
-DEPEND="virtual/x11
-	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
-}
diff --git a/media-gfx/xfig/xfig-3.2.4.ebuild b/media-gfx/xfig/xfig-3.2.4.ebuild
deleted file mode 100644
index 72aa6762e3fa..000000000000
--- a/media-gfx/xfig/xfig-3.2.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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.7 2004/07/14 18:33:19 agriffis Exp $
-
-inherit eutils
-
-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"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-IUSE=""
-
-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
-}
diff --git a/media-gfx/xfig/xfig-3.2.5_alpha5.ebuild b/media-gfx/xfig/xfig-3.2.5_alpha5.ebuild
new file mode 100644
index 000000000000..f5830d4ffc42
--- /dev/null
+++ b/media-gfx/xfig/xfig-3.2.5_alpha5.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/xfig-3.2.5_alpha5.ebuild,v 1.1 2005/09/24 21:31:55 vanquirius Exp $
+
+inherit eutils
+
+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://xfig.org"
+SRC_URI="http://xfig.org/software/${PN}/${PV/_/-}/${MY_P}.full.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+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 "${FILESDIR}/${P}-gentoo.diff"
+	epatch "${FILESDIR}/${P}-xaw3d.diff"
+}
+
+src_compile() {
+	xmkmf || die
+	make BINDIR=/usr/bin XFIGLIBDIR=/usr/lib/xfig || die
+}
+
+src_install() {
+
+	make \
+		DESTDIR="${D}" \
+		BINDIR=/usr/bin \
+		XFIGLIBDIR=/usr/lib/xfig \
+		MANDIR=/usr/share/man/man1 \
+		MANSUFFIX=1 \
+		install install.all || die
+
+	mv "${D}"/usr/share/doc/{${P},${PF}}
+	dodoc README FIGAPPS CHANGES LATEX.AND.XFIG
+	dodoc ../${SHAPE_P}/shapepatch.README
+}