sci-mathematics/freefem++: fix building the documentation with >=app-text/texlive-2008

app-vim/freefem++-syntax: moved download location to omploader

5 files changed, 52 insertions, 124 deletions

diff --git a/sci-mathematics/freefem++/ChangeLog b/sci-mathematics/freefem++/ChangeLog
index 80a8f567c..54a9314fe 100644
--- a/sci-mathematics/freefem++/ChangeLog
+++ b/sci-mathematics/freefem++/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for sci-mathematics/freefem++
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  12 Apr 2009; David Radice <david.e.pi.3.14@gmail.com>
+  +files/freefem++-texlive2008.patch, +freefem++-2.24.2-r3.ebuild,
+  -freefem++-2.24.2-r1.ebuild, -freefem++-2.24.2.ebuild:
+  Fixed building the documentation with >=app-text/texlive-2008.
+
   06 Dec 2008; David Radice <david.e.pi.3.14@gmail.com>
   +files/freefem++-P1-fix.patch, +freefem++-2.24.2-r2.ebuild:
   Install needed headers with the examples. Backport a fix for the second
diff --git a/sci-mathematics/freefem++/Manifest b/sci-mathematics/freefem++/Manifest
index 1db6d2459..2a6e26561 100644
--- a/sci-mathematics/freefem++/Manifest
+++ b/sci-mathematics/freefem++/Manifest
@@ -2,9 +2,9 @@ AUX freefem++-P1-fix.patch 793 RMD160 493ec623aae985130f0ad7d8a152d84844f24f6a S
 AUX freefem++-acoptim.patch 663 RMD160 6294d436eaf8bdea7258b3ca704e5ff9f942f019 SHA1 0ebe27e991bdd3949d3bf671056a15ce23f4f29f SHA256 6d07f4cd1a061d401879e54568fbeb2a035951b50195dfd3b88b05086a87cbb7
 AUX freefem++-gcc43.patch 6566 RMD160 5d8dcb917ec2e5367eb04ddc25e083f6fbb36cfe SHA1 70e4e373d204ccc774d08557cc4ed366688dd6fc SHA256 b114df6f1079c8e7e8a2c393d6dc0c414c38c5c15fe3c4df7ec5c670e0628383
 AUX freefem++-no-x11r6-dir.patch 401 RMD160 e655fee7b078162aa04e08289e8aceaa6663b884 SHA1 bbe3e6b32573abcb45e75b2a9844a5ee175d6694 SHA256 867136ede23c25a8e7ea61fa542e589c1f35a3d6a8a37658da0ced8a25d4bb26
+AUX freefem++-texlive2008.patch 984 RMD160 b22bc9a810b23b784e576658d4a971414cc3e190 SHA1 537fe8e3b5612424ed1b3d5e4335521560690419 SHA256 b84db5990298efa28b801a17493f2e75cd418f7921cc970ff5d46d11fcace698
 DIST freefem++-2.24-2.tar.gz 10974055 RMD160 db4ce51f42eabd00b0f85f37c0a3c9e1f126c17c SHA1 ea5968f49d4c9b682a6e09998c7bc254187de422 SHA256 58865bf6679c78c21448abd3c824b511f152e360e4c436368f36a9c54c0aeaf1
-EBUILD freefem++-2.24.2-r1.ebuild 3212 RMD160 af35eb62247aaa31a75032b51cab0a5838f6cde8 SHA1 df886e912dd425d33f7efd2b2a9bfa9627eccd9d SHA256 a8d10d3bb621212c7f93f836daa5fbb8f7d746ddddc3e6d5cd6968134a2c77dd
 EBUILD freefem++-2.24.2-r2.ebuild 3480 RMD160 4208d316f1545a6172a54bb3ec33e184e95cf185 SHA1 b400d10c1711fe06fe851ca420f550616862625a SHA256 fd26d8f4582230a69691b62d57cc16aa54e88876554fb5d09773856991091001
-EBUILD freefem++-2.24.2.ebuild 3106 RMD160 498179afe0ded9df56557f6f623033574bf7216b SHA1 6725391e90c9f05c8d2473ea5d59c2929eb397ce SHA256 a25854dda2081a4e9331c50eecad317cd1d6edf685499621100b579013bc553b
+EBUILD freefem++-2.24.2-r3.ebuild 3585 RMD160 0ecc4ad73cd024b7fb8a1587c241b5fb534700cc SHA1 6aa6be921ae1e052f88db834b2899bd4f427d9bb SHA256 982b31e2763bf6a586d6fa22a8b1c1eae66058e68f462e2f29e6e6f7946c099c
 MISC ChangeLog 1539 RMD160 dc7adb94a312221e1da9de052532fac119c41691 SHA1 e6b404c64a317fb124c4c7feb7d8f327a25f847c SHA256 da05e550087a78b0a497aab28ce011fa9e4f5d812bea81dcf443c45b758b691c
 MISC metadata.xml 381 RMD160 17dca0ed77bf65c0d2d8aa2148243f67c4a05edf SHA1 f583b125502b06a151f200849e2892bd08dbc70e SHA256 d7569d977d779a55533651e01e4d45e5ae7a1ada36b634e8b988ae4db86cdb83
diff --git a/sci-mathematics/freefem++/files/freefem++-texlive2008.patch b/sci-mathematics/freefem++/files/freefem++-texlive2008.patch
new file mode 100644
index 000000000..c33ad8cb7
--- /dev/null
+++ b/sci-mathematics/freefem++/files/freefem++-texlive2008.patch
@@ -0,0 +1,34 @@
+diff -urN freefem++-2.24-2.old/DOC/dessin.sty freefem++-2.24-2.new/DOC/dessin.sty
+--- freefem++-2.24-2.old/DOC/dessin.sty	2009-04-12 18:05:17.000000000 +0200
++++ freefem++-2.24-2.new/DOC/dessin.sty	2009-04-12 18:13:51.000000000 +0200
+@@ -1,10 +1,4 @@
+-\newif\ifpdf
+-\ifx\pdfoutput\undefined
+-\pdffalse % we are not running PDFLaTeX
+-\else
+-\pdfoutput=1 % we are running PDFLaTeX
+-\pdftrue
+-\fi
++\usepackage{ifpdf}
+ 
+ \ifpdf
+ \usepackage[pdftex]{graphicx}
+diff -urN freefem++-2.24-2.old/DOC/styles.sty freefem++-2.24-2.new/DOC/styles.sty
+--- freefem++-2.24-2.old/DOC/styles.sty	2009-04-12 18:05:07.000000000 +0200
++++ freefem++-2.24-2.new/DOC/styles.sty	2009-04-12 18:13:35.000000000 +0200
+@@ -1,14 +1,6 @@
+ 
+ %\RequirePackage{everyshi}%
+-\newif\ifpdf
+-\pdffalse
+-\@ifundefined{pdfoutput}{\message{-- no pdf -- }}{
+-    \ifcase\pdfoutput
+-    \message{-- no  pdf -- }
+-    \else
+-    \pdftrue
+-    \message{--  ++ pdf -- }
+-    \fi}
++\usepackage{ifpdf}
+ 
+ \ifpdf
+ \usepackage{pdfsync}
diff --git a/sci-mathematics/freefem++/freefem++-2.24.2-r1.ebuild b/sci-mathematics/freefem++/freefem++-2.24.2-r3.ebuild
index 9bd1025db..869f6c918 100644
--- a/sci-mathematics/freefem++/freefem++-2.24.2-r1.ebuild
+++ b/sci-mathematics/freefem++/freefem++-2.24.2-r3.ebuild
@@ -42,6 +42,10 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-no-x11r6-dir.patch
 	# fix building with gcc-4.3 (thanks to Dominik 'Rathann' Mierzejewsk)
 	epatch "${FILESDIR}"/${PN}-gcc43.patch
+	# backport a fix to a problem with P1 fespace
+	epatch "${FILESDIR}"/${PN}-P1-fix.patch
+	# fix documentation building with >=app-text/texlive-2008
+	epatch "${FILESDIR}"/${PN}-texlive2008.patch
 
 	eautoreconf
 }
@@ -120,6 +124,12 @@ src_install() {
 		einfo "it's better to copy the entire examples++-tutorial folder into"
 		einfo "the user directory."
 		doins regtests.sh
+
+		# Install the needed headers with examples++-load
+		tar -xzhf examples++-load/include.tar.gz -C examples++-load
+		rm -f examples++-load/._*
+		rm examples++-load/include.tar.gz
+
 		rm -f examples*/Makefile*
 		doins -r examples*
 	fi
diff --git a/sci-mathematics/freefem++/freefem++-2.24.2.ebuild b/sci-mathematics/freefem++/freefem++-2.24.2.ebuild
deleted file mode 100644
index 84e282ed5..000000000
--- a/sci-mathematics/freefem++/freefem++-2.24.2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils autotools versionator flag-o-matic
-
-MY_PV=$(replace_version_separator 2 '-')
-
-DESCRIPTION="Solve PDEs using FEM on 2d domains"
-HOMEPAGE="http://www.freefem.org/ff++/"
-SRC_URI="http://www.freefem.org/ff%2B%2B/ftp/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples fltk mpi vim-syntax X"
-
-RDEPEND="sci-libs/fftw
-	virtual/cblas
-	virtual/lapack
-	sci-libs/umfpack
-	>=sci-libs/arpack-96-r2
-	vim-syntax? ( app-vim/freefem++-syntax )
-	X? (
-		x11-libs/libXpm
-		fltk? ( x11-libs/fltk )
-		)
-	mpi? ( virtual/mpi )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( virtual/latex-base media-gfx/imagemagick )"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# acoptim.m4 forced -O2 removal
-	epatch "${FILESDIR}"/${PN}-acoptim.patch
-	eautoreconf
-}
-
-src_compile() {
-	local myconf
-
-	# Tested using mpich2, upstream built freefem++ with mpich and lam-mpi.
-	# So it should work, at least with this three MPI implementations.
-	if use mpi; then
-		if has_version sys-cluster/mpich2 ; then
-			myconf="${myconf} --with-mpi=mpicxx"
-		else
-			myconf="${myconf} --with-mpi=mpiCC"
-		fi
-	else
-		myconf="--without-mpi"
-	fi
-
-	use fltk && append-cppflags $(fltk-config --cflags)
-
-	econf \
-		--disable-download \
-		--disable-optim \
-		--enable-generic \
-		--with-blas="$(pkg-config --libs blas)" \
-		--with-lapack="$(pkg-config --libs lapack)" \
-		$(use_with fltk) \
-		$(use_with X x) \
-		${myconf} \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-
-	if use doc; then
-		emake documentation || die "emake documentation failed"
-	fi
-}
-
-src_test() {
-	# This may depend on the used MPI implementation. It is needed
-	# with mpich2, but should not be needed with lam-mpi or mpich
-	# (if the system is configured correctly).
-	ewarn "Please check that your MPI root ring is on before running"
-	ewarn "the test phase. Failing to start it before that phase may"
-	ewarn "result in a failing emerge."
-	epause
-	emake -j1 check || die "check test failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	if use fltk; then
-		einfo "\"FreeFem++-ide\" is not intended for user use."
-		einfo "Use the \"FreeFem++-cs\" command to access the IDE."
-		einfo
-	fi
-
-	insinto /usr/share/doc/${PF}
-	if use doc; then
-		doins DOC/freefem++doc.pdf || die
-	fi
-
-	if use examples; then
-		einfo "Installing examples..."
-
-		# Remove compiled examples:
-		emake clean || die "emake clean failed"
-
-		einfo "Some of the installed examples assumes that the user has write"
-		einfo "permissions in the working directory and other will look for"
-		einfo "data files in the working directory. For this reason in order to"
-		einfo "run the examples it's better to temporary copy them somewhere"
-		einfo "in the user folder. For example to run the tutorial examples"
-		einfo "it's better to copy the entire examples++-tutorial folder into"
-		einfo "the user directory."
-		doins regtests.sh
-		rm -f examples*/Makefile*
-		doins -r examples*
-	fi
-}