Bump to 2.11

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x565C32BC

4 files changed, 112 insertions, 7 deletions

diff --git a/sci-mathematics/normaliz/ChangeLog b/sci-mathematics/normaliz/ChangeLog
index 9532ccf1caab..05b698275857 100644
--- a/sci-mathematics/normaliz/ChangeLog
+++ b/sci-mathematics/normaliz/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/normaliz
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/normaliz/ChangeLog,v 1.15 2013/07/27 14:59:12 tomka Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/normaliz/ChangeLog,v 1.16 2014/05/09 13:36:16 tomka Exp $
+
+*normaliz-2.11 (09 May 2014)
+
+  09 May 2014; Thomas Kahle <tomka@gentoo.org>
+  +files/normaliz-2.11-respect-flags.patch, +normaliz-2.11.ebuild:
+  Bump to 2.11
 
 *normaliz-2.10.1 (27 Jul 2013)
 
diff --git a/sci-mathematics/normaliz/Manifest b/sci-mathematics/normaliz/Manifest
index cfe6b3d3a8f8..29b801c8c12b 100644
--- a/sci-mathematics/normaliz/Manifest
+++ b/sci-mathematics/normaliz/Manifest
@@ -2,20 +2,23 @@
 Hash: SHA256
 
 AUX normaliz-2.10-respect-flags.patch 1278 SHA256 2d43c1dc6e3533114e42f26f15319e78c459f19f9fbf34fb2dcd30bef70473f8 SHA512 eb7d2d4db3264bc2d5097c9b76dc094ef616944fdc5ee1cd5a6e7a01488d81a39d3af7d745934891a52e2d96945baab36a779b19e9a73f803beafd02a99294a9 WHIRLPOOL 70ed35fecd178a76d14b54528bd07a97111cb660804de0f02fdd89dce18906fc880487e67d90a18db9dc43d9ce30a21528193b7b1f85f2e6b14e8321bbfbfc54
+AUX normaliz-2.11-respect-flags.patch 1566 SHA256 838b2e1e870925d517e476c76fb0c5639f34ebc79131de56efe01c7662747cf2 SHA512 22229a770fdc8aefbc1a318af4a0f9b63fcf72bfec05c9f1f1a22714d7b3080580d05590bfb36163458bd77663fbfa3ff510405178fb9360039287023577d6fd WHIRLPOOL aca7e5f6811fd38fc7315bd1caea3eb3328497550ded0e4898dea265409e22431f131ec89a8007cfdbc30f400b766caa07a72f24af984b1ed98fcbca6a23d755
 AUX normaliz-2.5-respect-flags.patch 1381 SHA256 2c216675652ad8c7f41112bd8f97bfdb9c4493088081909ae6042ff4449c1818 SHA512 ae69d581de3cd712a7da07f11b21cafaf9dd684ada6919e9ae28884fefa7ef30f30e02e04be6b9c28be75216a560d89361ae6c07cab24cf3a62c07de15266779 WHIRLPOOL 368e79c97645d6406e4af40d6ba6276a75e81dd9e958b7f3dbb9c2742333f11599f78ed08debf4ca55a2cb67a67f408c316788b3e7d8d60e683b6da81a6febf3
 AUX normaliz-2.7-respect-flags.patch 1652 SHA256 3bfbbcf377607f4a7f1a169a9d42b047ea0b0a596b8aa8e8fa27da55c676220a SHA512 b08c55cb1678f1993f5bd55d0d754f49bc6f021d105b4d0c0dd7b5464b9034056143e7534c148ce3105044ce6b4e7639ef88f5942744da930141f0bae0a71668 WHIRLPOOL 1079ae8ab17b9870ab9eaa0c913527ec7d2dbe92bcbf22f1979edf7056eab7b1dec32cd678525ffc28c07f5be01e77339e3efec97e9a0d1985a5d60ce37bf37a
 AUX normaliz-2.8-respect-flags.patch 3018 SHA256 7ce5d8dc77f62f9cc27ccc8e72c9324b2c28ce9afb0ef7ebb7cd48764e6341c4 SHA512 ea7556160a78c81494483c4c7cea7e91a541bba8a4fd5f51adde156f7a8c80cb6649d4db5057297ce4a3d112c07b292b8daca4f93673e8071f67c760ccd2568c WHIRLPOOL 04f194056c1dd0d93e7744e1ffc755881832b134efe2391f65f37a7a22d65d2ef2cd562304b5944333b6c70cddd4967b1f752b0aad4dde9dce3242461a6a3d54
 DIST Normaliz2.10.zip 6172120 SHA256 0bf4910e9cfd71a22e3f0b9f77e8ce520e380872510096d4b5cc0b9498084788 SHA512 99a1d0ed28c0df96769500aacb99e1393480e717ce438174063b2844e8bf09d265f3de6db76e8ea4f47507e35a691a2dc0ee68c567d55acf3ac39e2e95a5781a WHIRLPOOL 6deb90616a459a16e5b1f62ee97b6b954b830ff157bb08dddcb372ae8b6e2402051bb119855d82133d7652eece1a1399e61f0a43aaf40ed88ea64230e345aef3
+DIST Normaliz2.11.zip 6814586 SHA256 9600e92011acb7deef3e94016eeb67e1b393ce1923a146a95d17e11b072d28ab SHA512 487aaf330d28322c7c1c3818faef8282ff98fb29151f63246b89041e2caca974dc2b4a845ef7a683d4b14951d2d32f88f8d1ac4725aa9e1698c95b838b50aaf7 WHIRLPOOL 77dfebe816ebd7dd6bfb8d3d24fb4ced13311855a93eb868de66e6846e530f19f950ec0c4331ddeda204bee9a65a288bf5296e18d0bdfe7deef92d8c04eeb9dc
 DIST Normaliz2.5.zip 4678783 SHA256 31decc5172450ac918b97ff5cefb3b9b9b94e70d69cc4271962ba90f04ecde43 SHA512 38533ea00887429105831ad7272fabed18c9aa4c44ae0aa1265dc235f27120f161f6b760b98cede5aaceb44590397ea3e2c5a7e1d209924820543f494a338953 WHIRLPOOL 235c932df90dcc887ad2017575c711e634ec698ec48ea72bc06fd094e174690de6a6bbcf7da68a5551b0db2d0f15397d58d38336e2039a82b949ae441210cdf0
 EBUILD normaliz-2.10.1.ebuild 1817 SHA256 41337bcf2600379e2d9524025e7869a95e05c3d458718adafb80a96e9989ed18 SHA512 aea356f53551ec9138208d4d956d9e917516365c41a57937581360333f4daa69b1aeb1b0ebc4972178da7fb1530d5e9d2cd22716d19db23ef40ec4c418ec38d2 WHIRLPOOL 5c54ab9ccd2a02999c3cb0e865e629588cd55db5897fab1aff9f2799c48002a89372116507aca5ba3c7f80c51487be4c2708f52c5b190b2aa4a1a0c6c5293899
 EBUILD normaliz-2.10.ebuild 1748 SHA256 fe21035a743b652e6beabc06053ddb486a235f38293926b3e3a8f29686dbfb58 SHA512 f9e97f53932582f272eeabfee1145bcc59af295ff54e03f83e97b58aaed6cf350913f99faba8bcfc45e3a5baa3e07257e48416731f5c74ee663915df8c29986c WHIRLPOOL 3ed4cd81dc7308a62b224d4f19501bca6d627a86a567fb9c38e63bd7b705edcd3e5dc00120003008882581ebda7ab9cd3755a56b02daabb6c524c6a48f37aafd
+EBUILD normaliz-2.11.ebuild 1800 SHA256 030b4b9e63ee004dd2e9e735cf872cf5ec001b3c2330fff336a4b212f7d9e96b SHA512 6a201038752ae89554141e69e2311ad15f802a683061dfe5cf94de00bab6752167e5a18c17c898db07c7289b2ecca2b14b7df1a932e84512b9b1ecb09af01b8c WHIRLPOOL 425595e0cabbc5e87e21005fbb999eb93f469f98b59d658b52626302aa9c4ef5791a70e08600c901d5a12989a7c1d7a980208fc929ef12ba0a34ab6e8330d360
 EBUILD normaliz-2.5-r1.ebuild 1563 SHA256 3108fe5f4b797ea678797492d4b2ede43479e1d24d1cc86d4372ac648e69aa02 SHA512 2bde771d8c319b7fab9697a974b2a3dfb3f51212d8d2727af08ceed4001ede5cc929609058ee8c90848793e99462d8b144ae9ab427f1927bb87259176d91a944 WHIRLPOOL db9b5781a73fd61e48f5db9dee42365688d8a1a740595fdf448b2833445c3709b6d50f6c6c5277f19894d5d5e8c7234fcf913f3f696639225d5cb4ef5514e110
-MISC ChangeLog 2302 SHA256 14537564fc52a02a014d6285c56e3d9cbe8c6fe4d821faeb7d4a06ad0be1b5f5 SHA512 2b8278d34832becc2ff9e0ab5070617bd8135065cf96f3933342fd993982d5bc6abf94924d96b61dbf4c9558105c21d998af762a729253c7dd919116edb53eb9 WHIRLPOOL 018f7dfd4d9810d44dbbfcd781ea9c70235a37d510d19533dff48cb8da8856a90e70a9a0b798fbcfd74165b661d3fbe9bad00807c3f54e6e4a52a56b0c8ff8fe
+MISC ChangeLog 2462 SHA256 0192d6cc97dfc3f40a23d92da0b0ad9987fadc59df86f9e711131a3576cee7df SHA512 582c302d0bcf51a254c957528bb0164df691c9e9af2af064a264558af1524956c977c563ab964a3c1eacad9a99aaa21de1d263ddc4e2e1e8d372c4c92f09dddd WHIRLPOOL 57155b7684d41f8c874c2d2fb5af1db5a2c47690fa6f6c17f829930ee6d0cc58425d04ee4a80fc1f5faa4797110fc499063c51624ac784cee433573166c8b28c
 MISC metadata.xml 597 SHA256 0614108b9f9964523d351f009eda2c7e3af669a60ffa9265597c1ca040d5c90d SHA512 f29ea92fa2eef3f4441d69185481da62f496d9c85f8c249fd6b516b767b4f33d86ea991dc0091a519ca04e1d293c4c74b982cbf0456e6fd0d015013f5b09e1a6 WHIRLPOOL 261343c8a5e178e18532c70f8fb5170a69710f3ef6d657c6e19597374fbac00490be2e9aacca31dddf447808e7bb454d311369de6373b61775e1bf53de5b5e89
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlHz4EEACgkQid6yGVZcMrxibAEAiPPkiqHYwTT1nf3dCawPYVm0
-7TUu8jY+lTPGB/CZSm0BAN4T5lirRpDuj60qHjxEYZQQSkB9bvT7e+yWlhuXWjl5
-=xYB2
+iF4EAREIAAYFAlNs2d4ACgkQid6yGVZcMrzWhwEAn0m1prAIwQ83xOuTeYJUfS96
+JPUoiuJ/5i4ATfcgD9sA/0GST0Bxt9GEzSTDT7cDFbYFunixuJal48tyUYzFLjeT
+=yc/r
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/normaliz/files/normaliz-2.11-respect-flags.patch b/sci-mathematics/normaliz/files/normaliz-2.11-respect-flags.patch
new file mode 100644
index 000000000000..6d5c15f18202
--- /dev/null
+++ b/sci-mathematics/normaliz/files/normaliz-2.11-respect-flags.patch
@@ -0,0 +1,35 @@
+diff -U 3 -dHrN Normaliz2.11/source/Makefile Normaliz2.11.new/source/Makefile
+--- Normaliz2.11/source/Makefile	2014-02-24 12:44:10.000000000 +0100
++++ Normaliz2.11.new/source/Makefile	2014-05-09 15:26:52.885085512 +0200
+@@ -20,7 +20,7 @@
+ 	$(CXX) $(CXXFLAGS) $(NORMFLAGS) -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

+diff -U 3 -dHrN Normaliz2.11/source/Makefile.configuration Normaliz2.11.new/source/Makefile.configuration
+--- Normaliz2.11/source/Makefile.configuration	2014-04-29 11:06:24.000000000 +0200
++++ Normaliz2.11.new/source/Makefile.configuration	2014-05-09 15:26:52.875085512 +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.11.ebuild b/sci-mathematics/normaliz/normaliz-2.11.ebuild
new file mode 100644
index 000000000000..19a34550c6b5
--- /dev/null
+++ b/sci-mathematics/normaliz/normaliz-2.11.ebuild
@@ -0,0 +1,61 @@
+# 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.11.ebuild,v 1.1 2014/05/09 13:36:16 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}/${MYP}/${MYP}.zip"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="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}/${PN}-${MYPV}-respect-flags.patch"
+
+	# Respect users AR tool (Bug 474532)
+	sed -e "s:ar -cr:$(tc-getAR) -cr:" -i source/libnormaliz/Makefile
+
+	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
+	dodoc doc/"Normaliz_${MYPV}.pdf"
+	dodoc doc/"NmzIntegrate_1.2.pdf"
+	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
+}