sci-mathematics/freefem++: Version bump, now FHS comliant.

4 files changed, 204 insertions, 1 deletions

diff --git a/sci-mathematics/freefem++/ChangeLog b/sci-mathematics/freefem++/ChangeLog
index e43751203..2c682832f 100644
--- a/sci-mathematics/freefem++/ChangeLog
+++ b/sci-mathematics/freefem++/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 June 2009; David Radice <david.e.pi.3.14@gmail.com>
+  +freefem++-3.3.ebuild, +files/freefem++-no-doc-autobuild.patch:
+  Version bump, now FHS compliant.
+
+*freefem++-3.3 (13 June 2009)
+
   24 May 2009; David Radice <david.e.pi.3.14@gmail.com>
   +freefem++-3.2.ebuild, +files/freefem++-opengl-automagic.patch,
   +files/freefem++-make-clean.patch, +files/freefem++-lamboot.patch:
diff --git a/sci-mathematics/freefem++/Manifest b/sci-mathematics/freefem++/Manifest
index c04ef9ce6..3772bd770 100644
--- a/sci-mathematics/freefem++/Manifest
+++ b/sci-mathematics/freefem++/Manifest
@@ -3,12 +3,15 @@ AUX freefem++-acoptim.patch 663 RMD160 6294d436eaf8bdea7258b3ca704e5ff9f942f019
 AUX freefem++-gcc43.patch 6566 RMD160 5d8dcb917ec2e5367eb04ddc25e083f6fbb36cfe SHA1 70e4e373d204ccc774d08557cc4ed366688dd6fc SHA256 b114df6f1079c8e7e8a2c393d6dc0c414c38c5c15fe3c4df7ec5c670e0628383
 AUX freefem++-lamboot.patch 542 RMD160 29738d41470dcfda4f37113be53e8b4528a560bc SHA1 40f04c7c0e4255719213ae4fe00e101904ce03b0 SHA256 806bc6192bc229800a993a8ecf0870c6e601360c1a3de06367cd7d33c38a09ca
 AUX freefem++-make-clean.patch 404 RMD160 ab35d51de0acb9ade03120e8d6743ac98035ff36 SHA1 7fc01b056c6c872071d097ef7f4741d3d0bb4d50 SHA256 018de46dcf56b404959c150afc7db66e7180664ea818b7b3e35ddcd3a197cfc8
+AUX freefem++-no-doc-autobuild.patch 1764 RMD160 024cf96f74a32868018e2ce1daaa119bdc12fa5b SHA1 fed93164bb2b2be196ac32eb2ea0fae115bee024 SHA256 c3426957b1265ed6205b1cf6786f7b1319691445142276961c3f996ba566a9d2
 AUX freefem++-no-x11r6-dir.patch 401 RMD160 e655fee7b078162aa04e08289e8aceaa6663b884 SHA1 bbe3e6b32573abcb45e75b2a9844a5ee175d6694 SHA256 867136ede23c25a8e7ea61fa542e589c1f35a3d6a8a37658da0ced8a25d4bb26
 AUX freefem++-opengl-automagic.patch 744 RMD160 472964c5874582e56bcc7f5be6d43350ef17267e SHA1 bb60e97e2408b8663a2927a51f2d7ab497726429 SHA256 7b5c83b4a92702b66c44f5553f5f8b4639d271a498d95886a12a2ce7f17e9f7a
 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
 DIST freefem++-3.2.tar.gz 12443524 RMD160 05284d65e35d2da77ff55ba5ac6c40270adaa0fc SHA1 f9d99d8a744a2be19d180530dc40403a2e2ff652 SHA256 9c2fbef5b738d1c9c7e0158b2c07cd227bdffcc4ca66ae3b1a4267cf653d047f
+DIST freefem++-3.3.tar.gz 12442706 RMD160 6b939b4cf99e32e4b248924ff3ce8b3b278a3425 SHA1 f5f0a8328f804d41ca753ec8a999935292af4d90 SHA256 51fbcebb233e2fa0ab15fe27bf359a5c73ec17da7048c11d1f2e828f4e928d47
 EBUILD freefem++-2.24.2-r3.ebuild 3585 RMD160 2ef387a12052df4248d9202a43b7cffd552174df SHA1 b453e77d841c19f16e483b0b9f7bfa1c327f6595 SHA256 ca322e94b12c872ad6f5987b3d37839aee5615e0ed4fa0525a035ed6ef863b23
 EBUILD freefem++-3.2.ebuild 3203 RMD160 bea96c52c05492bd50f68354b6115cc20889084c SHA1 2e188de3b1ce208f7c3d7e52fe6f243f678abf5e SHA256 90588b72dc11bca24be74f9a381e531f58052132e711bdff1ef4f31937f050cd
-MISC ChangeLog 2178 RMD160 ceea2e7d0548fac8c1a7a94a5904b1d34bccd4e3 SHA1 939dccf5f8617df432c9eed47d9d75b079dd9eb1 SHA256 004c7d55752d30402e8d28061186ccf59a8093473732b89f79a5685604f01db4
+EBUILD freefem++-3.3.ebuild 3658 RMD160 0fffbe06c40563380dbaa644f98b7a2f2baf2367 SHA1 792c4fd3c80f93952a5ebbf53b77e695bf0c7e3d SHA256 ac477d5a55614c3bdb6a7a6e1370542cd2fdcca4423f1b71d193152624d1c4c3
+MISC ChangeLog 2368 RMD160 2cdcba33dc862ca3c9947df28fae6c41d9858274 SHA1 89ea5dd9e5f2854df7e12f1d092ebd29b941ee10 SHA256 bea4740133859a26d15da801237fcc4714f4b306f013a2d5e825380aa2165eeb
 MISC metadata.xml 381 RMD160 17dca0ed77bf65c0d2d8aa2148243f67c4a05edf SHA1 f583b125502b06a151f200849e2892bd08dbc70e SHA256 d7569d977d779a55533651e01e4d45e5ae7a1ada36b634e8b988ae4db86cdb83
diff --git a/sci-mathematics/freefem++/files/freefem++-no-doc-autobuild.patch b/sci-mathematics/freefem++/files/freefem++-no-doc-autobuild.patch
new file mode 100644
index 000000000..188db2589
--- /dev/null
+++ b/sci-mathematics/freefem++/files/freefem++-no-doc-autobuild.patch
@@ -0,0 +1,46 @@
+diff -urN freefem++-3.3.old/DOC/Makefile.am freefem++-3.3.new/DOC/Makefile.am
+--- freefem++-3.3.old/DOC/Makefile.am	2009-06-08 15:00:09.000000000 +0200
++++ freefem++-3.3.new/DOC/Makefile.am	2009-06-08 15:08:15.000000000 +0200
+@@ -1,4 +1,3 @@
+-dist_pkgdata_DATA=$(DOCPDF)
+ documentation: $(DOCPDF) 
+ docps:  $(DOCPS) $(DOCPSGZ) 
+ docpdf: $(DOCPDF) 
+@@ -117,4 +116,4 @@
+ 
+ 
+ # do not delete the copy figure to long to created 
+-.PRECIOUS: $(CPFIGS_PDF) $(CPFIGS_EPS)
+\ No newline at end of file
++.PRECIOUS: $(CPFIGS_PDF) $(CPFIGS_EPS)
+diff -urN freefem++-3.3.old/Makefile.am freefem++-3.3.new/Makefile.am
+--- freefem++-3.3.old/Makefile.am	2009-06-08 15:00:08.000000000 +0200
++++ freefem++-3.3.new/Makefile.am	2009-06-08 15:01:22.000000000 +0200
+@@ -25,16 +25,6 @@
+ 
+ FF_MAC_PREFIX=FreeFem++v$(VERSION)$(ADD_PACKAGE_NAME)
+ 
+-FF_EXAMPLES_FILES = COPYRIGHT HISTORY HISTORY_BEFORE_2005 README BUGS TODO INSTALL INSTALL-MacOSX INNOVATION \
+-mode-mi-edp.zip \
+-examples++-tutorial/aile.msh examples++-tutorial/xyf \
+-examples++-3d/dodecaedre01.mesh  \
+-examples++-load/load.link \
+-./examples++-mpi/regtests.sh ./examples++-other/speedtest.sh  \
+-./download/fftw/Makefile ./download/fftw/Makefile.am \
+-examples++/*.edp 
+-
+-
+ # Creates a file named "ChangeLog" containing the chronology of all
+ # modifications to the source files. Needs "cvs2cl" to be installed.
+ 
+@@ -146,10 +136,6 @@
+ 
+ # Native MacOS packaging
+ # ----------------------
+-install-exec-local:: 
+-	$(mkinstalldirs) -m 755 $(DESTDIR)$(pkgdatadir)/$(VERSION)
+-	tar cvf - $(FF_EXAMPLES_FILES)| (cd $(DESTDIR)$(pkgdatadir)/$(VERSION); tar xvf -)
+-
+ ListFiles-natives: .FORCE 
+ #	echo COPYRIGHT HISTORY HISTORY_BEFORE_2005 README BUGS TODO INSTALL INSTALL-MacOSX INNOVATION >$@	
+ #	echo mode-mi-edp.zip >> $@
diff --git a/sci-mathematics/freefem++/freefem++-3.3.ebuild b/sci-mathematics/freefem++/freefem++-3.3.ebuild
new file mode 100644
index 000000000..bafcd62c1
--- /dev/null
+++ b/sci-mathematics/freefem++/freefem++-3.3.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils autotools versionator flag-o-matic mpi
+
+MY_PV=$(replace_version_separator 2 '-')
+
+DESCRIPTION="Solve PDEs using FEM on 2d and 3d 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"
+IUSE="doc examples mpi opengl vim-syntax X"
+
+RDEPEND="sci-libs/fftw
+	virtual/cblas
+	virtual/lapack
+	sci-libs/umfpack
+	>=sci-libs/arpack-96-r2
+	mpi? ( $(mpi_pkg_deplist) )
+	opengl? (
+		virtual/glut
+		virtual/opengl
+		)
+	vim-syntax? ( app-vim/freefem++-syntax )
+	X? (
+		media-fonts/font-misc-misc
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXpm
+		x11-libs/libXxf86vm
+		)"
+
+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
+	# do not try to do a forced "manual" installation of 
+	# examples and documentation
+	epatch "${FILESDIR}"/${PN}-no-doc-autobuild.patch
+
+	eautoreconf
+}
+
+src_compile() {
+	local myconf
+
+	if use mpi; then
+		myconf="${myconf} --with-mpi=$(mpi_pkg_cxx)"
+	else
+		myconf="--without-mpi"
+	fi
+
+	econf \
+		--disable-download \
+		--disable-optim \
+		--enable-generic \
+		--with-blas="$(pkg-config --libs blas)" \
+		--with-lapack="$(pkg-config --libs lapack)" \
+		$(use_enable opengl) \
+		$(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() {
+	if use mpi; then
+		# 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
+	fi
+	emake -j1 check || die "check test failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	# Fixing freefem++.pref
+	dodir /etc
+	cat > "${D}"/etc/freefem++.pref <<EOF
+loadpath += "./"
+loadpath += "/usr/lib/${PN}"
+EOF
+	rm "${D}"/usr/lib/ff++/${MY_PV}/etc/freefem++.pref
+	rmdir "${D}"/usr/lib/ff++/${MY_PV}/etc
+
+	# Move the libraries to the right location
+	dodir /usr/lib/${PN}
+	mv "${D}"/usr/lib/ff++/${MY_PV}/lib/* "${D}"/usr/lib/${PN}
+	rmdir "${D}"/usr/lib/ff++/${MY_PV}/lib
+
+	# Move the headers to the right location
+	dodir /usr/include/${PN}
+	mv "${D}"/usr/lib/ff++/${MY_PV}/include/* "${D}"/usr/include/${PN}
+	rmdir "${D}"/usr/lib/ff++/${MY_PV}/include
+
+	# Remove empty directory tree
+	rmdir "${D}"/usr/lib/ff++/${MY_PV}
+	rmdir "${D}"/usr/lib/ff++
+
+	dodoc AUTHORS INNOVATION HISTORY* README
+
+	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."
+
+		rm -f examples*/Makefile*
+		doins -r examples*
+	fi
+}