Install documentaion where it's supposed to go, closes bug #127385

Package-Manager: portage-2.1.2.1

3 files changed, 29 insertions, 11 deletions

diff --git a/media-gfx/xfig/ChangeLog b/media-gfx/xfig/ChangeLog
index 9862c9ce0675..0bb02ccbb28c 100644
--- a/media-gfx/xfig/ChangeLog
+++ b/media-gfx/xfig/ChangeLog
@@ -1,6 +1,12 @@
 # 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.29 2007/01/17 18:50:59 antarus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/ChangeLog,v 1.30 2007/03/05 17:32:54 anant Exp $
+
+*xfig-3.2.4-r3 (05 Mar 2007)
+
+  05 Mar 2007; <anant@gentoo.org> -xfig-3.2.4-r1.ebuild,
+  +xfig-3.2.4-r3.ebuild:
+  Put documentation where it's supposed to be, closes bug #127385
 
   17 Jan 2007; Alec Warner <antarus@gentoo.org> xfig-3.2.4-r2.ebuild,
   xfig-3.2.5_alpha5.ebuild:
diff --git a/media-gfx/xfig/files/digest-xfig-3.2.4-r1 b/media-gfx/xfig/files/digest-xfig-3.2.4-r3
index 22b5683b4448..4082a12ca609 100644
--- a/media-gfx/xfig/files/digest-xfig-3.2.4-r1
+++ b/media-gfx/xfig/files/digest-xfig-3.2.4-r3
@@ -1,3 +1,6 @@
+MD5 50c20eb5cae5268352cfe996e32b8f3c shape-patch.3.2.4-shape-1.1.tar.gz 49201
+RMD160 0d8738fd8b3d04e334580355a5a8c312f6b957d2 shape-patch.3.2.4-shape-1.1.tar.gz 49201
+SHA256 150dfc36ae2448f998b55eb8145d50d1d4efeaf952d8c6341ed98afef9cd82f0 shape-patch.3.2.4-shape-1.1.tar.gz 49201
 MD5 fbc5f9f480651bcfb189e95a642f3fe0 xfig-3.2.4-gentoo.diff.bz2 1001
 RMD160 2f54a944be8039e4d51b1109acf70e41d67abf3d xfig-3.2.4-gentoo.diff.bz2 1001
 SHA256 5197554a9778e8ef2ede5d1dee5629ca56c8a36e5d8bd3f195f2a4506243f659 xfig-3.2.4-gentoo.diff.bz2 1001
diff --git a/media-gfx/xfig/xfig-3.2.4-r1.ebuild b/media-gfx/xfig/xfig-3.2.4-r3.ebuild
index 73b629140f94..cba79d094c4d 100644
--- a/media-gfx/xfig/xfig-3.2.4-r1.ebuild
+++ b/media-gfx/xfig/xfig-3.2.4-r3.ebuild
@@ -1,19 +1,22 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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.4-r1.ebuild,v 1.12 2006/12/02 00:30:11 masterdriverz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/xfig-3.2.4-r3.ebuild,v 1.1 2007/03/05 17:32:54 anant Exp $
 
-inherit eutils
+inherit eutils multilib
 
 MY_P=${PN}.${PV}
 S=${WORKDIR}/${MY_P}
+SHAPE_P=shape-patch.${PV}-shape-1.1
+
 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
+	http://www.ctan.org/tex-archive/graphics/transfig-shapepatch/${SHAPE_P}.tar.gz
 	mirror://gentoo/${P}-gentoo.diff.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="x86 ppc ~sparc alpha ~hppa amd64 ~ppc64"
+KEYWORDS="~x86"
 IUSE=""
 
 RDEPEND="|| ( ( x11-libs/libXaw
@@ -28,7 +31,8 @@ DEPEND="${RDEPEND}
 	|| ( ( x11-misc/imake
 			app-text/rman
 			x11-proto/xproto
-			x11-proto/inputproto )
+			x11-proto/inputproto
+			x11-libs/libXi )
 		virtual/x11 )"
 
 src_unpack() {
@@ -36,21 +40,26 @@ src_unpack() {
 	cd ${S}
 	epatch ${WORKDIR}/${P}-gentoo.diff
 	epatch ${FILESDIR}/${P}-xaw3d.diff
+	epatch ../${SHAPE_P}/${PN}.${SHAPE_P#*.}.patch	# bug #20877
+	epatch ${FILESDIR}/${P}-gcc4.patch
 }
 
 src_compile() {
 	xmkmf || die
-	emake || die
+	emake BINDIR=/usr/bin XFIGLIBDIR=/usr/$(get_libdir)/xfig || die
 }
 
 src_install() {
-	emake DESTDIR=${D} install || die
 
-	emake \
+	emake -j1 \
 		DESTDIR=${D} \
+		BINDIR=/usr/bin \
+		XFIGLIBDIR=/usr/$(get_libdir)/xfig \
 		MANDIR=/usr/share/man/man1 \
 		MANSUFFIX=1 \
-		install.all || die
+		install install.all || die
 
-	dodoc README FIGAPPS CHANGES LATEX.AND.XFIG
+	insinto /usr/share/doc/${P}
+	doins README FIGAPPS CHANGES LATEX.AND.XFIG
+	doins ../${SHAPE_P}/shapepatch.README
 }