public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/freefem++/files/, sci-mathematics/freefem++/
@ 2021-01-16 20:54 Andrew Ammerlaan
  0 siblings, 0 replies; only message in thread
From: Andrew Ammerlaan @ 2021-01-16 20:54 UTC (permalink / raw
  To: gentoo-commits

commit:     3d4503dad48ec13e9b448698da2a6cce4298ac7e
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Sat Jan 16 20:53:38 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sat Jan 16 20:53:38 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=3d4503da

sci-mathematics/freefem++: version bump, fix fetch

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 .../freefem++/files/freefem++-acoptim.patch        |  17 ----
 .../files/freefem++-no-doc-autobuild.patch         |  30 ------
 .../freefem++/files/freefem++-path.patch           | 105 ---------------------
 ...freefem++-3.8.ebuild => freefem++-4.7.1.ebuild} |  53 +++--------
 4 files changed, 14 insertions(+), 191 deletions(-)

diff --git a/sci-mathematics/freefem++/files/freefem++-acoptim.patch b/sci-mathematics/freefem++/files/freefem++-acoptim.patch
deleted file mode 100644
index 087b077cb..000000000
--- a/sci-mathematics/freefem++/files/freefem++-acoptim.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- freefem++-2.20-1/acoptim.m4	2006-01-27 16:51:16.000000000 +0100
-+++ freefem++-2.20-1.new/acoptim.m4	2007-11-14 18:50:37.000000000 +0100
-@@ -16,14 +16,6 @@
- AC_ARG_ENABLE(debug,[  --enable-debug	Turn on debug versions of FreeFem++])
- AC_ARG_ENABLE(optim,[  --enable-optim	Turn on compiler optimization])
- 
--# Autoconf always chooses -O2. -O2 in gcc makes some functions
--# disappear. This is not ideal for debugging. And when we optimize, we
--# do not use -O2 anyway.
--
--CFLAGS="`echo $CFLAGS | sed 's/-O2//g'`"
--FFLAGS="`echo $FFLAGS | sed 's/-O2//g'`"
--CXXFLAGS="`echo $CXXFLAGS | sed 's/-O2//g'`"
--
- if test "$enable_debug" = yes;
- then
- 	AC_MSG_RESULT(yes)
\ No newline at end of file

diff --git a/sci-mathematics/freefem++/files/freefem++-no-doc-autobuild.patch b/sci-mathematics/freefem++/files/freefem++-no-doc-autobuild.patch
deleted file mode 100644
index add003aea..000000000
--- a/sci-mathematics/freefem++/files/freefem++-no-doc-autobuild.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -urN freefem++-3.4.old/DOC/Makefile.am freefem++-3.4.new/DOC/Makefile.am
---- freefem++-3.4.old/DOC/Makefile.am	2009-07-15 17:19:57.000000000 +0200
-+++ freefem++-3.4.new/DOC/Makefile.am	2009-07-15 17:20:22.000000000 +0200
-@@ -1,4 +1,4 @@
--dist_pkgdata_DATA=$(DOCPDF)
-+all:
- documentation: $(DOCPDF) 
- docps:  $(DOCPS) $(DOCPSGZ) 
- docpdf: $(DOCPDF) 
-@@ -117,4 +117,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.4.old/Makefile.am freefem++-3.4.new/Makefile.am
---- freefem++-3.4.old/Makefile.am	2009-07-15 17:19:57.000000000 +0200
-+++ freefem++-3.4.new/Makefile.am	2009-07-15 17:55:42.000000000 +0200
-@@ -147,10 +147,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++/files/freefem++-path.patch b/sci-mathematics/freefem++/files/freefem++-path.patch
deleted file mode 100644
index bc30a238d..000000000
--- a/sci-mathematics/freefem++/files/freefem++-path.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-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.8.ebuild b/sci-mathematics/freefem++/freefem++-4.7.1.ebuild
similarity index 64%
rename from sci-mathematics/freefem++/freefem++-3.8.ebuild
rename to sci-mathematics/freefem++/freefem++-4.7.1.ebuild
index 545301816..2afb7d92f 100644
--- a/sci-mathematics/freefem++/freefem++-3.8.ebuild
+++ b/sci-mathematics/freefem++/freefem++-4.7.1.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit autotools eutils flag-o-matic mpi versionator toolchain-funcs
+inherit autotools flag-o-matic toolchain-funcs
 
-MY_PV=$(replace_version_separator 2 '-')
+MY_PV="$(ver_rs 2 -)"
 
 DESCRIPTION="Solve PDEs using FEM on 2d and 3d domains"
-HOMEPAGE="http://www.freefem.org/ff++/"
-SRC_URI="http://www.freefem.org/ff++/ftp/old-v3/${PN}-${MY_PV}.tar.gz"
+HOMEPAGE="https://freefem.org/"
+SRC_URI="https://github.com/FreeFem/FreeFem-sources/archive/v4.7-1.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="doc examples mpi opengl X"
+IUSE="examples mpi opengl X"
 
 RDEPEND="
 	sci-libs/fftw:3.0
@@ -22,7 +22,8 @@ RDEPEND="
 	virtual/lapack
 	sci-libs/umfpack
 	sci-libs/arpack
-	mpi? ( $(mpi_pkg_deplist) )
+	sci-libs/hdf5[cxx,mpi?]
+	mpi? ( virtual/mpi )
 	opengl? (
 		media-libs/freeglut
 		virtual/opengl
@@ -35,25 +36,13 @@ RDEPEND="
 		x11-libs/libXxf86vm
 		)"
 
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-		media-gfx/imagemagick
-		)"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-S="${WORKDIR}/${PN}-${MY_PV}"
+S="${WORKDIR}/FreeFem-sources-${MY_PV}"
 
 src_prepare() {
-	# 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
-	# Honor FHS
-	epatch "${FILESDIR}"/${PN}-path.patch
+	default
 
 	eautoreconf
 }
@@ -62,7 +51,7 @@ src_configure() {
 	local myconf
 
 	if use mpi; then
-		myconf="${myconf} --with-mpi=$(mpi_pkg_cxx)"
+		myconf="${myconf} --with-mpi=/usr/bin/mpi"
 	else
 		myconf="--without-mpi"
 	fi
@@ -74,18 +63,9 @@ src_configure() {
 		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
 		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \
 		$(use_enable opengl) \
-		$(use_with X x) \
 		${myconf}
 }
 
-src_compile() {
-	default
-
-	if use doc; then
-		emake documentation
-	fi
-}
-
 src_test() {
 	if use mpi; then
 		# This may depend on the used MPI implementation. It is needed
@@ -102,11 +82,6 @@ src_test() {
 src_install() {
 	default
 
-	insinto /usr/share/doc/${PF}
-	if use doc; then
-		doins DOC/freefem++doc.pdf
-	fi
-
 	if use examples; then
 		einfo "Installing examples..."
 


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2021-01-16 20:54 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-16 20:54 [gentoo-commits] proj/sci:master commit in: sci-mathematics/freefem++/files/, sci-mathematics/freefem++/ Andrew Ammerlaan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox