diff options
Diffstat (limited to 'sci-mathematics')
4 files changed, 62 insertions, 110 deletions
diff --git a/sci-mathematics/normaliz/ChangeLog b/sci-mathematics/normaliz/ChangeLog index 65b70b1a7bc9..49b7a07345e9 100644 --- a/sci-mathematics/normaliz/ChangeLog +++ b/sci-mathematics/normaliz/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sci-mathematics/normaliz # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/normaliz/ChangeLog,v 1.20 2014/08/15 08:53:57 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/normaliz/ChangeLog,v 1.21 2014/08/18 07:33:26 tomka Exp $ + +*normaliz-2.5-r1 (18 Aug 2014) + + 18 Aug 2014; Thomas Kahle <tomka@gentoo.org> +normaliz-2.5-r1.ebuild, + -files/normaliz-2.7-respect-flags.patch, + -files/normaliz-2.8-respect-flags.patch: + Undo drop (bug #520160) 15 Aug 2014; Justin Lecher <jlec@gentoo.org> -normaliz-2.5-r1.ebuild, -normaliz-2.10.ebuild, metadata.xml: diff --git a/sci-mathematics/normaliz/files/normaliz-2.7-respect-flags.patch b/sci-mathematics/normaliz/files/normaliz-2.7-respect-flags.patch deleted file mode 100644 index 27c4935a3edc..000000000000 --- a/sci-mathematics/normaliz/files/normaliz-2.7-respect-flags.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -U 3 -dHrN Normaliz2.7.orig/source/Makefile Normaliz2.7/source/Makefile ---- Normaliz2.7.orig/source/Makefile 2011-07-08 13:02:49.000000000 +0200 -+++ Normaliz2.7/source/Makefile 2011-07-08 13:04:45.000000000 +0200 -@@ -17,14 +17,14 @@ - $(MAKE) --directory=libnormaliz libnormaliz.o - - normaliz: $(SOURCES) $(HEADERS) libnormaliz/libnormaliz.o -- $(CXX) $(CXXFLAGS) $(NORMFLAGS) Normaliz.cpp libnormaliz/libnormaliz.o $(GMPFLAGS) -o normaliz -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(NORMFLAGS) Normaliz.cpp libnormaliz/libnormaliz.o $(GMPFLAGS) -o normaliz - - normaliz1: $(SOURCES) $(HEADERS) $(LIBHEADERS) $(LIBSOURCES) -- $(CXX) $(CXXFLAGS) $(NORMFLAGS) Normaliz-impl.cpp $(GMPFLAGS) -o normaliz1 -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(NORMFLAGS) Normaliz-impl.cpp $(GMPFLAGS) -o normaliz1 - - - normaliz-pg: $(SOURCES) $(HEADERS) $(LIBHEADERS) $(LIBSOURCES) -- $(CXX) $(CXXFLAGS) $(NORMFLAGS) -pg Normaliz-impl.cpp $(GMPFLAGS) -o normaliz-pg -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(NORMFLAGS) -pg Normaliz-impl.cpp $(GMPFLAGS) -o normaliz-pg - - clean: - $(MAKE) --directory=libnormaliz clean -diff -U 3 -dHrN Normaliz2.7.orig/source/Makefile.configuration Normaliz2.7/source/Makefile.configuration ---- Normaliz2.7.orig/source/Makefile.configuration 2011-07-08 13:02:49.000000000 +0200 -+++ Normaliz2.7/source/Makefile.configuration 2011-07-08 13:03:26.000000000 +0200 -@@ -1,10 +1,8 @@ - ## - ## Makefile configuration for normaliz - ## --CXX = g++ - CXXFLAGS += -Wall - CXXFLAGS += -pedantic -Wno-long-long --CXXFLAGS += -O3 -funroll-loops - #CXXFLAGS += -g - #CXXFLAGS += -pg - -@@ -15,6 +13,5 @@ - CXXFLAGS += -fopenmp - endif - --NORMFLAGS = -static - GMPFLAGS = -lgmpxx -lgmp - diff --git a/sci-mathematics/normaliz/files/normaliz-2.8-respect-flags.patch b/sci-mathematics/normaliz/files/normaliz-2.8-respect-flags.patch deleted file mode 100644 index ebde3a0a35ec..000000000000 --- a/sci-mathematics/normaliz/files/normaliz-2.8-respect-flags.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -U 3 -dHrN Normaliz2.8.orig/source/libnormaliz/Makefile Normaliz2.8/source/libnormaliz/Makefile ---- Normaliz2.8.orig/source/libnormaliz/Makefile 2012-11-11 19:05:18.610268519 -0800 -+++ Normaliz2.8/source/libnormaliz/Makefile 2012-11-11 19:07:17.040437439 -0800 -@@ -11,16 +11,16 @@ - all: default - - libnormaliz.o: $(LIBHEADERS) $(LIBSOURCES) libnormaliz-impl.cpp -- $(CXX) $(CXXFLAGS) $(NORMFLAGS) -c libnormaliz-impl.cpp -o libnormaliz.o -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(NORMFLAGS) -c libnormaliz-impl.cpp -o libnormaliz.o - - cone_property.o: cone_property.h cone_property.cpp -- $(CXX) $(CXXFLAGS) $(NORMFLAGS) -c cone_property.cpp -o $@ -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(NORMFLAGS) -c cone_property.cpp -o $@ - - hilbert_series.o: $(LIBHEADERS) HilbertSeries.cpp -- $(CXX) $(CXXFLAGS) $(NORMFLAGS) -c HilbertSeries.cpp -o $@ -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(NORMFLAGS) -c HilbertSeries.cpp -o $@ - - libnormaliz-templated.o: $(LIBHEADERS) $(LIBSOURCES) libnormaliz-templated.cpp -- $(CXX) $(CXXFLAGS) $(NORMFLAGS) -c libnormaliz-templated.cpp -o $@ -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(NORMFLAGS) -c libnormaliz-templated.cpp -o $@ - - libnormaliz.a: cone_property.o hilbert_series.o libnormaliz-templated.o - ar -cr $@ $^ -diff -U 3 -dHrN Normaliz2.8.orig/source/Makefile Normaliz2.8/source/Makefile ---- Normaliz2.8.orig/source/Makefile 2012-11-11 19:05:18.610268519 -0800 -+++ Normaliz2.8/source/Makefile 2012-11-11 19:06:14.265817851 -0800 -@@ -17,13 +17,13 @@ - $(MAKE) normaliz - - normaliz: $(SOURCES) $(HEADERS) libnormaliz/libnormaliz.a -- $(CXX) $(CXXFLAGS) $(NORMFLAGS) Normaliz.cpp libnormaliz/libnormaliz.a $(GMPFLAGS) -o normaliz -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(NORMFLAGS) Normaliz.cpp libnormaliz/libnormaliz.a $(GMPFLAGS) -o normaliz - - normaliz1: $(SOURCES) $(HEADERS) $(LIBHEADERS) $(LIBSOURCES) -- $(CXX) $(CXXFLAGS) $(NORMFLAGS) Normaliz-impl.cpp $(GMPFLAGS) -o normaliz1 -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(NORMFLAGS) Normaliz-impl.cpp $(GMPFLAGS) -o normaliz1 - - normaliz-pg: $(SOURCES) $(HEADERS) $(LIBHEADERS) $(LIBSOURCES) -- $(CXX) $(CXXFLAGS) $(NORMFLAGS) -pg Normaliz-impl.cpp $(GMPFLAGS) -o normaliz-pg -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(NORMFLAGS) -pg Normaliz-impl.cpp $(GMPFLAGS) -o normaliz-pg - - - #always go down the directory and let the make there check what has to be done -diff -U 3 -dHrN Normaliz2.8.orig/source/Makefile.configuration Normaliz2.8/source/Makefile.configuration ---- Normaliz2.8.orig/source/Makefile.configuration 2012-11-11 19:05:18.613268547 -0800 -+++ Normaliz2.8/source/Makefile.configuration 2012-11-11 19:05:37.323453221 -0800 -@@ -1,11 +1,9 @@ - ## - ## Makefile configuration for normaliz - ## --CXX = g++ - #CXX = linux32 g++ -m32 -march=i686 #compile it for linux32 - CXXFLAGS += -Wall - CXXFLAGS += -pedantic -Wno-long-long --CXXFLAGS += -O3 -funroll-loops - #CXXFLAGS += -I /usr/local/boost_1_45_0 - #CXXFLAGS += -g - #CXXFLAGS += -pg -@@ -19,7 +17,6 @@ - endif - - ##for mac link libgcc not static --NORMFLAGS = -static - #NORMFLAGS = -static-libgcc - - GMPFLAGS = -lgmpxx -lgmp diff --git a/sci-mathematics/normaliz/normaliz-2.5-r1.ebuild b/sci-mathematics/normaliz/normaliz-2.5-r1.ebuild new file mode 100644 index 000000000000..d39b2c663473 --- /dev/null +++ b/sci-mathematics/normaliz/normaliz-2.5-r1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/normaliz/normaliz-2.5-r1.ebuild,v 1.9 2014/08/18 07:33:26 tomka Exp $ + +EAPI=2 + +inherit eutils toolchain-funcs + +MYP="Normaliz${PV}" + +DESCRIPTION="tool for computations in affine monoids and more" +HOMEPAGE="http://www.mathematik.uni-osnabrueck.de/normaliz/" +SRC_URI="http://www.mathematik.uni-osnabrueck.de/${PN}/${MYP}.zip" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="extras openmp" + +RDEPEND="dev-libs/gmp[cxx]" +DEPEND="${RDEPEND} + app-arch/unzip" + +S=${WORKDIR}/${MYP} + +src_prepare () { + epatch "${FILESDIR}/${P}-respect-flags.patch" + + if use openmp && tc-has-openmp; then + export OPENMP=yes + else + export OPENMP=no + fi +} + +src_compile(){ + emake CXX="$(tc-getCXX)" OPENMP="${OPENMP}" -C source || die +} + +src_install() { + dobin source/{norm64,normbig} || die + dodoc doc/"${MYP}Documentation.pdf" || die + if use extras; then + elog "You have selected to install extras which consist of Macaulay2" + elog "and Singular packages. These have been installed into " + elog "/usr/share/${PN}, and cannot be used without additional setup. Please refer" + elog "to the homepages of the respective projects for additional information." + elog "Note however, Gentoo's versions of Singular and Macaulay2 bring their own" + elog "copies of these interface packages. Usually you don't need normaliz's versions." + insinto "/usr/share/${PN}" + doins Singular/normaliz.lib + doins Macaulay2/Normaliz.m2 + fi +} |