diff options
author | Thomas Kahle <tomka@gentoo.org> | 2014-10-25 13:23:21 +0000 |
---|---|---|
committer | Thomas Kahle <tomka@gentoo.org> | 2014-10-25 13:23:21 +0000 |
commit | cc9a070948b5623d6eac049c59779e5184c196ac (patch) | |
tree | 0157c07c90e5442793a886df402216ad5572b1a1 /sci-mathematics | |
parent | Unleash new bash-completion on ~arch so that users do not get bored. (diff) | |
download | gentoo-2-cc9a070948b5623d6eac049c59779e5184c196ac.tar.gz gentoo-2-cc9a070948b5623d6eac049c59779e5184c196ac.tar.bz2 gentoo-2-cc9a070948b5623d6eac049c59779e5184c196ac.zip |
bump to 2.12.1
(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 565C32BC)
Diffstat (limited to 'sci-mathematics')
-rw-r--r-- | sci-mathematics/normaliz/ChangeLog | 8 | ||||
-rw-r--r-- | sci-mathematics/normaliz/files/normaliz-2.12.1-respect-flags.patch | 47 | ||||
-rw-r--r-- | sci-mathematics/normaliz/normaliz-2.12.1.ebuild | 63 |
3 files changed, 117 insertions, 1 deletions
diff --git a/sci-mathematics/normaliz/ChangeLog b/sci-mathematics/normaliz/ChangeLog index 49b7a07345e9..570883a202b0 100644 --- a/sci-mathematics/normaliz/ChangeLog +++ b/sci-mathematics/normaliz/ChangeLog @@ -1,6 +1,12 @@ # 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.21 2014/08/18 07:33:26 tomka Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/normaliz/ChangeLog,v 1.22 2014/10/25 13:23:21 tomka Exp $ + +*normaliz-2.12.1 (25 Oct 2014) + + 25 Oct 2014; Thomas Kahle <tomka@gentoo.org> + +files/normaliz-2.12.1-respect-flags.patch, +normaliz-2.12.1.ebuild: + bump to 2.12.1 *normaliz-2.5-r1 (18 Aug 2014) diff --git a/sci-mathematics/normaliz/files/normaliz-2.12.1-respect-flags.patch b/sci-mathematics/normaliz/files/normaliz-2.12.1-respect-flags.patch new file mode 100644 index 000000000000..d7d83ee79d91 --- /dev/null +++ b/sci-mathematics/normaliz/files/normaliz-2.12.1-respect-flags.patch @@ -0,0 +1,47 @@ +diff -U 3 -dHrN Normaliz2.12/source/Makefile Normaliz2.12.patched/source/Makefile +--- Normaliz2.12/source/Makefile 2014-10-23 15:01:56.000000000 +0200 ++++ Normaliz2.12.patched/source/Makefile 2014-10-25 14:56:39.426295174 +0200 +@@ -17,16 +17,16 @@ + @$(MAKE) normaliz + + normaliz.o: $(SOURCES) $(HEADERS) $(LIBHEADERS) +- $(CXX) $(CXXFLAGS) $(NORMFLAGS) -c Normaliz.cpp -o normaliz.o ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) -c Normaliz.cpp -o normaliz.o + + normaliz: $(SOURCES) $(HEADERS) normaliz.o libnormaliz/libnormaliz.a +- $(CXX) $(CXXFLAGS) $(NORMFLAGS) normaliz.o libnormaliz/libnormaliz.a $(GMPFLAGS) -o normaliz ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) normaliz.o libnormaliz/libnormaliz.a $(GMPFLAGS) -o normaliz + + normaliz1: $(SOURCES) $(HEADERS) $(LIBHEADERS) $(LIBSOURCES) +- $(CXX) $(CXXFLAGS) $(NORMFLAGS) Normaliz-impl.cpp $(GMPFLAGS) -o normaliz1 ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) 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) -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.12/source/Makefile.configuration Normaliz2.12.patched/source/Makefile.configuration +--- Normaliz2.12/source/Makefile.configuration 2014-10-23 15:01:56.000000000 +0200 ++++ Normaliz2.12.patched/source/Makefile.configuration 2014-10-25 15:18:39.876313342 +0200 +@@ -1,11 +1,9 @@ + ## + ## Makefile configuration for normaliz + ## +-CXX = g++ + #CXX = linux32 g++ -m32 -march=i686 #compile it for linux32 + CXXFLAGS += -std=c++0x + CXXFLAGS += -Wall -pedantic +-CXXFLAGS += -O3 -funroll-loops + #CXXFLAGS += -I /usr/local/boost_1_45_0 + CXXFLAGS += -g ## debugging + #CXXFLAGS += -pg ## profiling +@@ -19,7 +17,6 @@ + endif + + ## for distributing the executables link static (does not work for mac) +-CXXFLAGS += -static + ## for almost static compilation on Mac use + #CXXFLAGS += -static-libgcc + ## make it compatible with older Mac versions diff --git a/sci-mathematics/normaliz/normaliz-2.12.1.ebuild b/sci-mathematics/normaliz/normaliz-2.12.1.ebuild new file mode 100644 index 000000000000..4601275247fa --- /dev/null +++ b/sci-mathematics/normaliz/normaliz-2.12.1.ebuild @@ -0,0 +1,63 @@ +# 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.12.1.ebuild,v 1.1 2014/10/25 13:23:21 tomka Exp $ + +EAPI=5 + +inherit eutils toolchain-funcs versionator + +MYPV=$(get_version_component_range 1-2) +MYP="Normaliz${MYPV}" + +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}/Normaliz${PV}/Normaliz${PV}.zip" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc extras openmp" + +RDEPEND="dev-libs/gmp[cxx]" +DEPEND="${RDEPEND} + app-arch/unzip + dev-libs/boost" +# Only a boost header is needed -> not RDEPEND + +S=${WORKDIR}/${MYP} + +src_prepare () { + epatch "${FILESDIR}/${P}-respect-flags.patch" + + # Respect users AR tool (Bug 474532) + sed -e "s:ar -cr:$(tc-getAR) -cr:" -i source/libnormaliz/Makefile || die + + 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 +} + +src_install() { + dobin source/normaliz + if use doc ; then + dodoc doc/"Normaliz.pdf" + dodoc doc/"NmzIntegrate.pdf" + fi + 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 +} |