From b5771069e3376eb146670ce90b3c7c4077c745cc Mon Sep 17 00:00:00 2001 From: Thomas Kahle Date: Thu, 4 Nov 2010 12:02:49 +0000 Subject: Improved metadata.xml and naming of patch (Portage version: 2.1.9.24/cvs/Linux i686) --- sci-mathematics/normaliz/ChangeLog | 7 +++- .../normaliz/files/normaliz-2.5-makefile.patch | 40 ---------------------- .../files/normaliz-2.5-respect-flags.patch | 40 ++++++++++++++++++++++ sci-mathematics/normaliz/metadata.xml | 3 +- sci-mathematics/normaliz/normaliz-2.5-r1.ebuild | 4 +-- 5 files changed, 50 insertions(+), 44 deletions(-) delete mode 100644 sci-mathematics/normaliz/files/normaliz-2.5-makefile.patch create mode 100644 sci-mathematics/normaliz/files/normaliz-2.5-respect-flags.patch (limited to 'sci-mathematics') diff --git a/sci-mathematics/normaliz/ChangeLog b/sci-mathematics/normaliz/ChangeLog index 154a1004a685..bc3af2e3c7d9 100644 --- a/sci-mathematics/normaliz/ChangeLog +++ b/sci-mathematics/normaliz/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sci-mathematics/normaliz # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/normaliz/ChangeLog,v 1.1 2010/11/03 08:24:52 tomka Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/normaliz/ChangeLog,v 1.2 2010/11/04 12:02:49 tomka Exp $ + + 04 Nov 2010; Thomas Kahle normaliz-2.5-r1.ebuild, + -files/normaliz-2.5-makefile.patch, + +files/normaliz-2.5-respect-flags.patch, metadata.xml: + Improved metadata.xml and naming of patch *normaliz-2.5-r1 (03 Nov 2010) diff --git a/sci-mathematics/normaliz/files/normaliz-2.5-makefile.patch b/sci-mathematics/normaliz/files/normaliz-2.5-makefile.patch deleted file mode 100644 index 98f426006e11..000000000000 --- a/sci-mathematics/normaliz/files/normaliz-2.5-makefile.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -U 3 -dHrN Normaliz2.5.orig/source/Makefile Normaliz2.5/source/Makefile ---- Normaliz2.5.orig/source/Makefile 2010-08-04 15:04:02.000000000 +0200 -+++ Normaliz2.5/source/Makefile 2010-10-20 22:47:23.000000000 +0200 -@@ -1,9 +1,7 @@ - ## - ## Makefile for normaliz - ## --CXX = g++ - CXXFLAGS += -Wall -Wno-sign-compare --CXXFLAGS += -O3 -funroll-loops -pipe - - ## use OpenMP? - ifeq ($(OPENMP),no) -@@ -12,8 +10,8 @@ - CXXFLAGS += -fopenmp - endif - --N64FLAGS = -Dnorm64 -static --NBIGFLAGS = -Dnormbig -static -+N64FLAGS = -Dnorm64 -+NBIGFLAGS = -Dnormbig - GMPFLAGS = -lgmpxx -lgmp - - SOURCES = full_cone.cpp integer.cpp cone_dual_mode.cpp lineare_transformation.cpp list_operations.cpp matrix.cpp mode.cpp Normaliz.cpp output.cpp simplex.cpp sublattice_representation.cpp vector_operations.cpp -@@ -29,13 +27,13 @@ - @mkdir -p obj64 - $(CXX) $(CXXFLAGS) $(N64FLAGS) -c $< -o $@ - norm64: Normaliz.cpp $(N64OBJ) -- $(CXX) $(CXXFLAGS) $(N64FLAGS) Normaliz.cpp $(N64OBJ) -o norm64 -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(N64FLAGS) Normaliz.cpp $(N64OBJ) -o norm64 - - objBig/%.o: %.cpp $(HEADERS) - @mkdir -p objBig - $(CXX) $(CXXFLAGS) $(NBIGFLAGS) -c $< -o $@ - normbig: Normaliz.cpp $(NBIGOBJ) -- $(CXX) $(CXXFLAGS) $(NBIGFLAGS) Normaliz.cpp $(NBIGOBJ) $(GMPFLAGS) -o normbig -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(NBIGFLAGS) Normaliz.cpp $(NBIGOBJ) $(GMPFLAGS) -o normbig - - clean: - -rm -rf obj64 objBig diff --git a/sci-mathematics/normaliz/files/normaliz-2.5-respect-flags.patch b/sci-mathematics/normaliz/files/normaliz-2.5-respect-flags.patch new file mode 100644 index 000000000000..98f426006e11 --- /dev/null +++ b/sci-mathematics/normaliz/files/normaliz-2.5-respect-flags.patch @@ -0,0 +1,40 @@ +diff -U 3 -dHrN Normaliz2.5.orig/source/Makefile Normaliz2.5/source/Makefile +--- Normaliz2.5.orig/source/Makefile 2010-08-04 15:04:02.000000000 +0200 ++++ Normaliz2.5/source/Makefile 2010-10-20 22:47:23.000000000 +0200 +@@ -1,9 +1,7 @@ + ## + ## Makefile for normaliz + ## +-CXX = g++ + CXXFLAGS += -Wall -Wno-sign-compare +-CXXFLAGS += -O3 -funroll-loops -pipe + + ## use OpenMP? + ifeq ($(OPENMP),no) +@@ -12,8 +10,8 @@ + CXXFLAGS += -fopenmp + endif + +-N64FLAGS = -Dnorm64 -static +-NBIGFLAGS = -Dnormbig -static ++N64FLAGS = -Dnorm64 ++NBIGFLAGS = -Dnormbig + GMPFLAGS = -lgmpxx -lgmp + + SOURCES = full_cone.cpp integer.cpp cone_dual_mode.cpp lineare_transformation.cpp list_operations.cpp matrix.cpp mode.cpp Normaliz.cpp output.cpp simplex.cpp sublattice_representation.cpp vector_operations.cpp +@@ -29,13 +27,13 @@ + @mkdir -p obj64 + $(CXX) $(CXXFLAGS) $(N64FLAGS) -c $< -o $@ + norm64: Normaliz.cpp $(N64OBJ) +- $(CXX) $(CXXFLAGS) $(N64FLAGS) Normaliz.cpp $(N64OBJ) -o norm64 ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(N64FLAGS) Normaliz.cpp $(N64OBJ) -o norm64 + + objBig/%.o: %.cpp $(HEADERS) + @mkdir -p objBig + $(CXX) $(CXXFLAGS) $(NBIGFLAGS) -c $< -o $@ + normbig: Normaliz.cpp $(NBIGOBJ) +- $(CXX) $(CXXFLAGS) $(NBIGFLAGS) Normaliz.cpp $(NBIGOBJ) $(GMPFLAGS) -o normbig ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(NBIGFLAGS) Normaliz.cpp $(NBIGOBJ) $(GMPFLAGS) -o normbig + + clean: + -rm -rf obj64 objBig diff --git a/sci-mathematics/normaliz/metadata.xml b/sci-mathematics/normaliz/metadata.xml index 03efd48282f2..ceb6e31d764a 100644 --- a/sci-mathematics/normaliz/metadata.xml +++ b/sci-mathematics/normaliz/metadata.xml @@ -7,7 +7,8 @@ sci-mathematics - Install Macaulay2 and Singular packages as shipped by upstream + Install sci-mathematics/Macaulay2 and sci-mathematics/singular + packages as shipped by upstream Normaliz is a (command line) tool for computations in affine monoids, vector configurations, lattice polytopes, and diff --git a/sci-mathematics/normaliz/normaliz-2.5-r1.ebuild b/sci-mathematics/normaliz/normaliz-2.5-r1.ebuild index 14b1a5b62f2a..1f87bf157a2b 100644 --- a/sci-mathematics/normaliz/normaliz-2.5-r1.ebuild +++ b/sci-mathematics/normaliz/normaliz-2.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 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.2 2010/11/03 22:39:59 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/normaliz/normaliz-2.5-r1.ebuild,v 1.3 2010/11/04 12:02:49 tomka Exp $ EAPI=2 @@ -24,7 +24,7 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${MYP} src_prepare () { - epatch "${FILESDIR}/${P}-makefile.patch" + epatch "${FILESDIR}/${P}-respect-flags.patch" if use openmp && tc-has-openmp; then export OPENMP=yes -- cgit v1.2.3-65-gdbad