Version bump, now using a patch from the Fedora project to honor FHS.

4 files changed, 120 insertions, 29 deletions

diff --git a/sci-mathematics/freefem++/ChangeLog b/sci-mathematics/freefem++/ChangeLog
index b36d62718..9d105501e 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: $
 
+  2 May 2010; David Radice <david.e.pi.3.14@gmail.com>
+  +freefem++-3.8.ebuild, +files/freefem++-path.patch, -freefem++-3.4.2.ebuild:
+  Version bump, now using a patch from the Fedora project to honor FHS.
+
+*freefem++-3.8 (2 May 2010)
+
   11 September 2009; David Radice <david.e.pi.3.14@gmail.com>
   +freefem++-3.5.ebuild, -freefem++-2.24.2-r3.ebuild, -freefem++-3.3.ebuild,
   -freefem++-3.4.ebuild, -files/freefem++-3.4-mortar-DN-4.patch,
diff --git a/sci-mathematics/freefem++/Manifest b/sci-mathematics/freefem++/Manifest
index 8bbcba024..a63f38ca4 100644
--- a/sci-mathematics/freefem++/Manifest
+++ b/sci-mathematics/freefem++/Manifest
@@ -1,9 +1,10 @@
 AUX freefem++-3.4.2-no-doc-autobuild.patch 1155 RMD160 39cc42211934298ec1dea2bb68fced68594277de SHA1 b40c9a7424b66eb737b9ebe1d689bea5b7077906 SHA256 c497606929d28a663c1ecb05af9a03b4395bbe3828889d9502c0b5a779cf2ff8
 AUX freefem++-acoptim.patch 663 RMD160 6294d436eaf8bdea7258b3ca704e5ff9f942f019 SHA1 0ebe27e991bdd3949d3bf671056a15ce23f4f29f SHA256 6d07f4cd1a061d401879e54568fbeb2a035951b50195dfd3b88b05086a87cbb7
 AUX freefem++-no-doc-autobuild.patch 1155 RMD160 39cc42211934298ec1dea2bb68fced68594277de SHA1 b40c9a7424b66eb737b9ebe1d689bea5b7077906 SHA256 c497606929d28a663c1ecb05af9a03b4395bbe3828889d9502c0b5a779cf2ff8
-DIST freefem++-3.4-2.tar.gz 18455053 RMD160 59cf1d9545a319b4bff032d65bdfaecde7ec061c SHA1 40748fcc8ce2ca6f4b4b6d954643bcdf1ca6d2d4 SHA256 70f92aa24aca17392b7e5f20cda5357769fec2f38e391406b6bc6d93ccdd5d2f
+AUX freefem++-path.patch 5244 RMD160 47ef29ac13194b1bedf47a6395eab3c392f1e87d SHA1 29b26f21cbbcd84f08b6c683125800ef21c36149 SHA256 1d47be7c24bc321a48e279fdfa9bf9b032241ebf0c553644a5681ff519197f10
 DIST freefem++-3.5.tar.gz 18472428 RMD160 3eccdd385566d470778d5a1fab494638f5bb1b85 SHA1 301fd85e72e7b4ca001fe20459ccde6d899b4895 SHA256 c67c859dc7e5b498fa52b5f7cf99e3325f6c2facf42afd5eb77e16f83192c687
-EBUILD freefem++-3.4.2.ebuild 3811 RMD160 9d0b4b98cb74be6e11b5f97155aa4cf1bdabd50a SHA1 ce0f0476a0c2d837ea2790d13d1d903ffffa204b SHA256 c772ec50a473d2ac61892df6d31fcfc508e0dcf7dbe7ba9f83abcd903f36c9ee
+DIST freefem++-3.8.tar.gz 21848854 RMD160 31e3b23ede5c0097cbd7c36bd79d8c95be4ea868 SHA1 791783afb35f76b3638180b89a4cf39c6b91d545 SHA256 4ea6d754eb3914f20b1fe7620d562e95461b7206f289108e2fc803baecf70e6c
 EBUILD freefem++-3.5.ebuild 3812 RMD160 6585e04525b9930f3e6def487aa3a90b2419ce69 SHA1 9ffa27db61a3fa08326c9ea707413bd99c6182e0 SHA256 e366a74974ebde35712f85d72f076fca86ca9020396f4a62407001dee3411e6b
-MISC ChangeLog 3403 RMD160 3eb1a05a5bb6ad54a17cafae59654e9900c4e4ae SHA1 5ece500d253f90c03b0fbd3aa55cc0114d097148 SHA256 02201b3c0caaaa1e8bb3ca4e8cebd990257e6478c1655e00714401d6e9493fcc
+EBUILD freefem++-3.8.ebuild 3163 RMD160 38da11077bc452e9a8732b9bb3d8ed99c4168c07 SHA1 27d0d6d57ce7b687fa8756105398b75e3e03e947 SHA256 0efa3d969864088b390738f4b7d8f90846b14a91ef0cf580ea3a59e4cb9edd98
+MISC ChangeLog 3639 RMD160 a02dc52c913b374c3ceb20c62207079f79e2d9f1 SHA1 4302a9f0acf8cc478ebb8a9bd11783e5288a5b38 SHA256 30381c3e3f2d0a5790cd697b53661b5af6b1d9bc8b498a4d4785f87306e310b9
 MISC metadata.xml 381 RMD160 17dca0ed77bf65c0d2d8aa2148243f67c4a05edf SHA1 f583b125502b06a151f200849e2892bd08dbc70e SHA256 d7569d977d779a55533651e01e4d45e5ae7a1ada36b634e8b988ae4db86cdb83
diff --git a/sci-mathematics/freefem++/files/freefem++-path.patch b/sci-mathematics/freefem++/files/freefem++-path.patch
new file mode 100644
index 000000000..bc30a238d
--- /dev/null
+++ b/sci-mathematics/freefem++/files/freefem++-path.patch
@@ -0,0 +1,105 @@
+diff -up freefem++-3.8/configure.ac.r freefem++-3.8/configure.ac
+--- freefem++-3.8/configure.ac.r	2010-02-04 14:48:19.000000000 +0100
++++ freefem++-3.8/configure.ac	2010-02-25 22:53:52.000000000 +0100
+@@ -353,7 +355,7 @@ AC_DEFINE_UNQUOTED(VersionFreeFempp,$ff_
+ # date is only useful for config-version.h
+ 
+ test "$prefix" = NONE && prefix="$ac_default_prefix"
+-ff_prefix_dir="${prefix}/lib/ff++/$VERSION"   
++ff_prefix_dir="${libdir}/freefem++"
+ AC_MSG_CHECKING(prefix dir freefem++  )
+ AC_MSG_RESULT($ff_prefix_dir)	 
+ 
+@@ -1250,7 +1252,7 @@ then
+ 		AC_CHECK_LIB(umfpack,umf_i_malloc,
+ 			ff_umfpack_libs=" -lumfpack $ff_umfpack_libs"
+ 			ff_umfpack_ok=yes,,$ff_umfpack_libs)
+-		if test "$ff_umfpack_ok" != yes -o "$ff_umfpack_header" != yes ; then
++		if test "$ff_umfpack_ok" = yes -a "$ff_umfpack_header" != yes ; then
+ 			AC_MSG_WARN([		Sorry we find UMFPACK lib but not the include umfpack.h file])
+ 		fi
+ 	fi	
+diff -up freefem++-3.8/examples++-3d/Makefile.am.r freefem++-3.8/examples++-3d/Makefile.am
+--- freefem++-3.8/examples++-3d/Makefile.am.r	2009-11-10 20:28:06.000000000 +0100
++++ freefem++-3.8/examples++-3d/Makefile.am	2010-02-25 22:41:45.000000000 +0100
+@@ -31,8 +31,8 @@ freefem++.pref:
+ 	echo loadpath += \"./\" >>freefem++.pref
+ 
+ install-exec-local:: 
+-	$(mkinstalldirs) -m 755 $(DESTDIR)$(ff_prefix_dir)/idp
+-	$(INSTALL)  -m 555  $(LIST_IDP)  $(DESTDIR)$(ff_prefix_dir)/idp
++	$(mkinstalldirs) -m 755 $(DESTDIR)$(datadir)/freefem++/idp
++	$(INSTALL)  -m 555  $(LIST_IDP)  $(DESTDIR)$(datadir)/freefem++/idp
+ 
+ 
+ 
+diff -up freefem++-3.8/examples++-load/load.link.in.r freefem++-3.8/examples++-load/load.link.in
+--- freefem++-3.8/examples++-load/load.link.in.r	2009-12-04 15:53:45.000000000 +0100
++++ freefem++-3.8/examples++-load/load.link.in	2010-02-25 22:41:45.000000000 +0100
+@@ -26,8 +26,8 @@ if [ -z "$INCFF" ] ; then
+ 	INCFF="-Iinclude"
+     elif [ -f "FFAPPLI_INC/ff++.hpp" ] ; then 
+ 	INCFF="-IFFAPPLI_INC" 
+-    elif [ -f '@ff_prefix_dir@/include/ff++.hpp' ] ; then 
+-	INCFF='-I@ff_prefix_dir@/include' 
++    elif [ -f '@includedir@/freefem++/ff++.hpp' ] ; then
++	INCFF='-I@includedir@/freefem++'
+     else
+ 	ff=`which freefem++.exe`;
+ 	ffinc=`dirname "$ff"`/examples++-load/include
+diff -up freefem++-3.8/examples++-load/Makefile.am.r freefem++-3.8/examples++-load/Makefile.am
+--- freefem++-3.8/examples++-load/Makefile.am.r	2010-01-28 20:38:21.000000000 +0100
++++ freefem++-3.8/examples++-load/Makefile.am	2010-02-25 23:13:32.000000000 +0100
+@@ -95,7 +95,7 @@ all.edp: 
+ regtests.edp: regtests.m4 ../regtests.m4
+ 	m4 -DASSERT regtests.m4 > regtests.edp
+ 
+-$(LIST_COMPILE):ff-c++ include Makefile 
++$(LIST_COMPILE) $(LIST_COMPILE_PKG):ff-c++ include Makefile 
+ 
+ clean-local:
+ 	-rm *.o  load.link WHERE_LIBRARY-download ff-get-dep ff-c++ ff-pkg-download \
+@@ -121,19 +121,19 @@ WHERE_LIBRARY-download:ff-pkg-download 
+ freefem++.pref:
+ 	echo loadpath = \"./\" >freefem++.pref
+ install-exec-local:: load_compile
+-	$(mkinstalldirs) -m 755 $(DESTDIR)$(ff_prefix_dir)/lib
+-	$(mkinstalldirs) -m 755 $(DESTDIR)$(ff_prefix_dir)/include
+-	$(mkinstalldirs) -m 755 $(DESTDIR)$(ff_prefix_dir)/etc
+-	$(INSTALL_DATA)  include/* $(DESTDIR)$(ff_prefix_dir)/include
+-	$(INSTALL)  -m 555 $(LIST_COMPILE) $(DESTDIR)$(ff_prefix_dir)/lib
+-	echo loadpath += \"./\"  >$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
+-	echo loadpath += \"$(ff_prefix_dir)/lib\"  >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
+-	echo includepath += \"$(ff_prefix_dir)/idp\"  >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
++	$(mkinstalldirs) -m 755 $(DESTDIR)$(libdir)/freefem++
++	$(mkinstalldirs) -m 755 $(DESTDIR)$(includedir)/freefem++
++	$(mkinstalldirs) -m 755 $(DESTDIR)$(sysconfdir)
++	$(INSTALL_DATA)  include/* $(DESTDIR)$(includedir)/freefem++
++	$(INSTALL)  -m 555 $(LIST_COMPILE) $(DESTDIR)$(libdir)/freefem++
++	echo loadpath += \"./\"  >$(DESTDIR)$(sysconfdir)/freefem++.pref
++	echo loadpath += \"$(libdir)/freefem++\"  >>$(DESTDIR)$(sysconfdir)/freefem++.pref
++	echo includepath += \"$(datadir)/freefem++/idp\"  >>$(DESTDIR)$(sysconfdir)/freefem++.pref
+ 	$(INSTALL_SCRIPT) ff-c++  $(DESTDIR)${bindir}
+ 	$(INSTALL_SCRIPT) ff-pkg-download  $(DESTDIR)${bindir}
+ 	$(INSTALL_SCRIPT) ff-get-dep  $(DESTDIR)${bindir}
+ 	-for i in $(LIST_COMPILE_PKG); do \
+-	 if [ -f $$i ] ; then 	$(INSTALL)  -m 555 $$i $(DESTDIR)$(ff_prefix_dir)/lib; fi; done
++	 if [ -f $$i ] ; then 	$(INSTALL)  -m 555 $$i $(DESTDIR)$(libdir)/freefem++; fi; done
+ 
+ 
+ 
+diff -up freefem++-3.8/src/lglib/Makefile.am.r freefem++-3.8/src/lglib/Makefile.am
+--- freefem++-3.8/src/lglib/Makefile.am.r	2010-01-10 22:47:14.000000000 +0100
++++ freefem++-3.8/src/lglib/Makefile.am	2010-02-25 22:41:45.000000000 +0100
+@@ -9,9 +9,9 @@ INCLUDES=-I../fflib -I../bamglib -I../Gr
+ BUILT_SOURCES=lg.tab.hpp lg.tab.cpp
+ 
+ lg.tab.hpp  lg.tab.cpp: lg.ypp
+-	-rm lg.tab.hpp  lg.tab.cpp lg.tab.cpp.h
++	-rm -f lg.tab.hpp  lg.tab.cpp lg.tab.cpp.h
+ 	bison -dtv -p lg  $< -o lg.tab.cpp
+-	-mv lg.tab.cpp.h  lg.tab.hpp # pour un  pb entre des versions de bison 
++	-mv -f lg.tab.cpp.h  lg.tab.hpp # pour un  pb entre des versions de bison 
+ libfreefem++.dylib: lg.tab.o ../fflib/libff.a
+ 	g++ -bundle lg.tab.o  ../fflib/libff.a $(UMFPACKLIB) $(ARPACKLIB) $(BLASLIB) $(LIBS) -o libfreefem++.dylib
+ EXTRA_DIST=lg.ypp
diff --git a/sci-mathematics/freefem++/freefem++-3.4.2.ebuild b/sci-mathematics/freefem++/freefem++-3.8.ebuild
index c94d04790..60af66c22 100644
--- a/sci-mathematics/freefem++/freefem++-3.4.2.ebuild
+++ b/sci-mathematics/freefem++/freefem++-3.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -53,11 +53,14 @@ 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}"/${P}-no-doc-autobuild.patch
+	epatch "${FILESDIR}"/${PN}-no-doc-autobuild.patch
+	# Honor FHS
+	epatch "${FILESDIR}"/${PN}-path.patch
 
 	eautoreconf
 }
@@ -105,30 +108,6 @@ src_test() {
 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}/idp
-	rmdir "${D}"/usr/lib/ff++/${MY_PV}
-	rmdir "${D}"/usr/lib/ff++
-
 	dodoc AUTHORS INNOVATION HISTORY* README
 
 	insinto /usr/share/doc/${PF}