Fixed commit strait into stable. Some other modifications mentioned in bug #173009.

(Portage version: 2.1.2.2)

5 files changed, 88 insertions, 55 deletions

diff --git a/media-gfx/xfig/ChangeLog b/media-gfx/xfig/ChangeLog
index 73c4bf79eabf..e252749b0e25 100644
--- a/media-gfx/xfig/ChangeLog
+++ b/media-gfx/xfig/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/xfig
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/ChangeLog,v 1.39 2007/04/01 18:58:26 anant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/ChangeLog,v 1.40 2007/04/02 15:23:03 pva Exp $
+
+*xfig-3.2.5-r1 (02 Apr 2007)
+
+  02 Apr 2007; <pva@gentoo.org> metadata.xml, -xfig-3.2.5.ebuild,
+  +xfig-3.2.5-r1.ebuild:
+  Fixed commit strait into stable. Some other modifications mentioned in bug
+  #173009.
 
   01 Apr 2007; Anant Narayanan <anant@gentoo.org> xfig-3.2.5.ebuild:
   Fix SRC_URI, closes bug #173009
diff --git a/media-gfx/xfig/files/digest-xfig-3.2.5 b/media-gfx/xfig/files/digest-xfig-3.2.5-r1
index 3d2c01837512..3d2c01837512 100644
--- a/media-gfx/xfig/files/digest-xfig-3.2.5
+++ b/media-gfx/xfig/files/digest-xfig-3.2.5-r1
diff --git a/media-gfx/xfig/metadata.xml b/media-gfx/xfig/metadata.xml
index b17012b02b48..fe8a273e1e15 100644
--- a/media-gfx/xfig/metadata.xml
+++ b/media-gfx/xfig/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>no-herd</herd>
 	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<description>This package lacks a primary herd or maintainer.</description>
+		<email>pva@gentoo.org</email>
+		<name>Peter Volkov</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/xfig/xfig-3.2.5-r1.ebuild b/media-gfx/xfig/xfig-3.2.5-r1.ebuild
new file mode 100644
index 000000000000..9ef8be9ee6f5
--- /dev/null
+++ b/media-gfx/xfig/xfig-3.2.5-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2007 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-r1.ebuild,v 1.1 2007/04/02 15:23:03 pva Exp $
+
+inherit eutils multilib
+
+MY_P=${PN}.${PV}
+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/software/xfig/3.2.5/${MY_P}.full.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="|| ( ( x11-libs/libXaw
+				x11-libs/libXp )
+			virtual/x11 )
+	x11-libs/Xaw3d
+	media-libs/jpeg
+	media-libs/libpng
+	>=media-gfx/transfig-3.2.5
+	media-libs/netpbm"
+DEPEND="${RDEPEND}
+	|| ( ( x11-misc/imake
+			app-text/rman
+			x11-proto/xproto
+			x11-proto/inputproto
+			x11-libs/libXi )
+		virtual/x11 )"
+
+S="${WORKDIR}"/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# We do not have nescape. Let's use firefox instead...
+	sed -i "s+netscape+firefox+g" Fig.ad
+}
+
+sed_Imakefile() {
+	# see Imakefile for details
+	vars2subs="BINDIR=/usr/bin
+		PNGINC=-I/usr/include
+		JPEGLIBDIR=/usr/$(get_libdir)
+		JPEGINC=-I/usr/include
+		XPMLIBDIR=/usr/$(get_libdir)
+		XPMINC=-I/usr/include/X11
+		USEINLINE=-DUSE_INLINE
+		XFIGLIBDIR=/usr/$(get_libdir)/xfig
+		XFIGDOCDIR=/usr/share/doc/${P}
+		MANDIR=/usr/share/man/man\$\(MANSUFFIX\)
+		CC=$(tc-getCC)"
+
+	for variable in ${vars2subs} ; do
+		varname=${variable%%=*}
+		varval=${variable##*=}
+		sed -i "s:^\(XCOMM\)*[[:space:]]*${varname}[[:space:]]*=.*$:${varname} = ${varval}:" "$@"
+	done
+}
+
+
+src_compile() {
+	sed_Imakefile Imakefile
+
+	xmkmf || die
+	emake CC="$(tc-getCC)" LOCAL_LDFLAGS="${LDFLAGS}" CDEBUGFLAGS="${CFLAGS}" \
+	USRLIBDIR=/usr/$(get_libdir) || die
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install.all || die
+
+	insinto /usr/share/doc/${P}
+	doins README FIGAPPS CHANGES LATEX.AND.XFIG
+}
diff --git a/media-gfx/xfig/xfig-3.2.5.ebuild b/media-gfx/xfig/xfig-3.2.5.ebuild
deleted file mode 100644
index 7aaf24e7bfdf..000000000000
--- a/media-gfx/xfig/xfig-3.2.5.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2007 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.ebuild,v 1.2 2007/04/01 18:58:26 anant Exp $
-
-inherit eutils multilib
-
-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/software/xfig/3.2.5/${MY_P}.full.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="|| ( ( x11-libs/libXaw
-				x11-libs/libXp )
-			virtual/x11 )
-	x11-libs/Xaw3d
-	media-libs/jpeg
-	media-libs/libpng
-	media-gfx/transfig
-	media-libs/netpbm"
-DEPEND="${RDEPEND}
-	|| ( ( x11-misc/imake
-			app-text/rman
-			x11-proto/xproto
-			x11-proto/inputproto
-			x11-libs/libXi )
-		virtual/x11 )"
-
-src_compile() {
-	xmkmf || die
-	emake BINDIR=/usr/bin XFIGLIBDIR=/usr/$(get_libdir)/xfig || die
-}
-
-src_install() {
-
-	emake -j1 \
-		DESTDIR=${D} \
-		BINDIR=/usr/bin \
-		XFIGLIBDIR=/usr/$(get_libdir)/xfig \
-		MANDIR=/usr/share/man/man1 \
-		MANSUFFIX=1 \
-		install install.all || die
-
-	insinto /usr/share/doc/${P}
-	doins README FIGAPPS CHANGES LATEX.AND.XFIG
-}