sci-visualization/xd3d: Respect CC, handle examples through USE=examples, use zlib.h instead of bundled zutil.h, #422765

(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

3 files changed, 31 insertions, 18 deletions

diff --git a/sci-visualization/xd3d/ChangeLog b/sci-visualization/xd3d/ChangeLog
index 2803fe02fa7c..91260229f44f 100644
--- a/sci-visualization/xd3d/ChangeLog
+++ b/sci-visualization/xd3d/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-visualization/xd3d
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/xd3d/ChangeLog,v 1.15 2011/06/21 14:30:51 jlec Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/xd3d/ChangeLog,v 1.16 2012/06/21 14:50:03 jlec Exp $
+
+  21 Jun 2012; Justin Lecher <jlec@gentoo.org> xd3d-8.3.1.ebuild, metadata.xml:
+  Respect CC, handle examples through USE=examples, use zlib.h instead of
+  bundled zutil.h, #422765
 
   21 Jun 2011; Justin Lecher <jlec@gentoo.org> xd3d-8.3.1.ebuild:
   Add dependency on virtual/fortran
diff --git a/sci-visualization/xd3d/metadata.xml b/sci-visualization/xd3d/metadata.xml
index 5d5074f5b142..0a0f012797ff 100644
--- a/sci-visualization/xd3d/metadata.xml
+++ b/sci-visualization/xd3d/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription>
+	<herd>sci</herd>
+	<longdescription>
 xd3d is a simple scientific visualization tool designed to be easy to learn. 
 It can plot 2d and 3d meshes, with shadowing, contour plots, vector fields, 
 iso-contour (3d), as well as 3d surfaces z=f(x,y) defined by an algebraic 
diff --git a/sci-visualization/xd3d/xd3d-8.3.1.ebuild b/sci-visualization/xd3d/xd3d-8.3.1.ebuild
index e2a26ee825da..f2d163435db8 100644
--- a/sci-visualization/xd3d/xd3d-8.3.1.ebuild
+++ b/sci-visualization/xd3d/xd3d-8.3.1.ebuild
@@ -1,33 +1,40 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/xd3d/xd3d-8.3.1.ebuild,v 1.9 2011/06/21 14:30:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/xd3d/xd3d-8.3.1.ebuild,v 1.10 2012/06/21 14:50:03 jlec Exp $
+
+EAPI=4
 
-EAPI=2
 inherit eutils fortran-2 toolchain-funcs
 
 DESCRIPTION="scientific visualization tool"
 HOMEPAGE="http://www.cmap.polytechnique.fr/~jouve/xd3d/"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
+IUSE="examples"
 
 RDEPEND="
 	virtual/fortran
-x11-libs/libXpm"
+	x11-libs/libXpm"
 DEPEND="${RDEPEND}
 	app-shells/tcsh"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.diff
-	epatch "${FILESDIR}"/${P}-parallel.patch
-	epatch "${FILESDIR}"/${P}-rotated.patch
+	epatch \
+		"${FILESDIR}"/${P}-gentoo.diff \
+		"${FILESDIR}"/${P}-parallel.patch \
+		"${FILESDIR}"/${P}-rotated.patch
+	sed \
+		-e 's:"zutil.h":<zlib.h>:g' \
+		-i src/qlib/timestuff.c || die
 }
 
 src_configure() {
-	export FC=$(tc-getFC)
-	sed -e "s:##D##:${D}:" \
+	tc-export FC CC
+	sed \
+		-e "s:##D##:${D}:" \
 		-e "s:##lib##:$(get_libdir):" \
 		-i RULES.gentoo \
 		|| die "failed to set up RULES.gentoo"
@@ -36,12 +43,14 @@ src_configure() {
 
 src_install() {
 	dodir /usr/bin
-	emake install || die "emake install failed"
+	emake install
 
 	dodoc BUGS CHANGELOG FAQ FORMATS README
 	insinto /usr/share/doc/${PF}
-	doins Manuals/* || die
+	doins Manuals/*
 
-	insinto /usr/share/doc/${PF}/examples
-	doins -r Examples/* || die
+	if use examples; then
+		insinto /usr/share/doc/${PF}/
+		doins -r Examples
+	fi
 }