Bump to 2.12.2, cleanup

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

5 files changed, 18 insertions, 110 deletions

diff --git a/sci-mathematics/normaliz/ChangeLog b/sci-mathematics/normaliz/ChangeLog
index 570883a202b0..cead83ad7cc4 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.22 2014/10/25 13:23:21 tomka Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/normaliz/ChangeLog,v 1.23 2015/01/29 10:02:44 tomka Exp $
+
+*normaliz-2.12.2 (29 Jan 2015)
+
+  29 Jan 2015; Thomas Kahle <tomka@gentoo.org> +normaliz-2.12.2.ebuild,
+  -files/normaliz-2.11-respect-flags.patch, -normaliz-2.11.ebuild,
+  -normaliz-2.12.1.ebuild:
+  Bump to 2.12.2, cleanup
 
 *normaliz-2.12.1 (25 Oct 2014)
 
diff --git a/sci-mathematics/normaliz/Manifest b/sci-mathematics/normaliz/Manifest
index 62b9b083a5f9..4a4a6bb1e75b 100644
--- a/sci-mathematics/normaliz/Manifest
+++ b/sci-mathematics/normaliz/Manifest
@@ -2,23 +2,20 @@
 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.12.1-respect-flags.patch 2097 SHA256 e759b884ea9e021d8f22bcd2f38b441517243ae84d19308f6f4349f327bb9385 SHA512 c5a01a49cd1f61a5eea007b991e44eb39910481a214ea169dbf87904c6bf258c23e6a85391e9584d125935b5b71e0b3285339fdd7f8e1d7e824aca6e953a2d54 WHIRLPOOL 7fc5ba979257d3ac56364566bd7e07d1d1154a7856ceea5137ec0daa23cfad97b566466ceb9c0a81b88f174960a98d9bc492d9e42a35d5cf559675c0254cc2aa
 AUX normaliz-2.5-respect-flags.patch 1381 SHA256 2c216675652ad8c7f41112bd8f97bfdb9c4493088081909ae6042ff4449c1818 SHA512 ae69d581de3cd712a7da07f11b21cafaf9dd684ada6919e9ae28884fefa7ef30f30e02e04be6b9c28be75216a560d89361ae6c07cab24cf3a62c07de15266779 WHIRLPOOL 368e79c97645d6406e4af40d6ba6276a75e81dd9e958b7f3dbb9c2742333f11599f78ed08debf4ca55a2cb67a67f408c316788b3e7d8d60e683b6da81a6febf3
 DIST Normaliz2.10.zip 6172120 SHA256 0bf4910e9cfd71a22e3f0b9f77e8ce520e380872510096d4b5cc0b9498084788 SHA512 99a1d0ed28c0df96769500aacb99e1393480e717ce438174063b2844e8bf09d265f3de6db76e8ea4f47507e35a691a2dc0ee68c567d55acf3ac39e2e95a5781a WHIRLPOOL 6deb90616a459a16e5b1f62ee97b6b954b830ff157bb08dddcb372ae8b6e2402051bb119855d82133d7652eece1a1399e61f0a43aaf40ed88ea64230e345aef3
-DIST Normaliz2.11.zip 6814586 SHA256 9600e92011acb7deef3e94016eeb67e1b393ce1923a146a95d17e11b072d28ab SHA512 487aaf330d28322c7c1c3818faef8282ff98fb29151f63246b89041e2caca974dc2b4a845ef7a683d4b14951d2d32f88f8d1ac4725aa9e1698c95b838b50aaf7 WHIRLPOOL 77dfebe816ebd7dd6bfb8d3d24fb4ced13311855a93eb868de66e6846e530f19f950ec0c4331ddeda204bee9a65a288bf5296e18d0bdfe7deef92d8c04eeb9dc
-DIST Normaliz2.12.1.zip 9002677 SHA256 928a892d0f77ef25b32620455d6de33ff75680d7760d86c681546782692e90ed SHA512 29e3c2b13712d75dc4d39b1d91e2f27f1862cc22fec08602c29133733b8440dcc31910f6efcd6caa957cf781fefbadae5d249aab8a159665b980ab892b150f4e WHIRLPOOL 55aefc7c25842cc68b6e6de8f5ff253c4767c27bfa4dc4de84b91aec4c655c9dcb7954ada7b52f109c9439dc5e246d07e8838ea469a627242b08ed1ede308fc2
+DIST Normaliz2.12.2.zip 6432949 SHA256 230772425b3c9964b9e144c0919c75fac0ec95260a1943c10a8a94eea9d7273e SHA512 fd42071cb87b8efbaf9af0885c173a0583e0b38dedb8821a83225eeebb44060a7b5748c44adfc4faeac20c3a1706071bcb9883cb4447e4a1ff3aeb770bd22038 WHIRLPOOL cb2974e02eac6e6d51c234214a719a24ad2e12d1400f0a6f8aee3e7a4ba3aa2ba053beec65c9032f42726e4dd4f1866820bb5b7b96f7c3d34cd132fcdbdb91af
 DIST Normaliz2.5.zip 4678783 SHA256 31decc5172450ac918b97ff5cefb3b9b9b94e70d69cc4271962ba90f04ecde43 SHA512 38533ea00887429105831ad7272fabed18c9aa4c44ae0aa1265dc235f27120f161f6b760b98cede5aaceb44590397ea3e2c5a7e1d209924820543f494a338953 WHIRLPOOL 235c932df90dcc887ad2017575c711e634ec698ec48ea72bc06fd094e174690de6a6bbcf7da68a5551b0db2d0f15397d58d38336e2039a82b949ae441210cdf0
 EBUILD normaliz-2.10.1.ebuild 1827 SHA256 2788588a1937f7d27256f50c2ed744af71305452e5cd13a5e204378fddd223f8 SHA512 8e34b2d92005bb7f6a3966914d560c1880fcd47e25862d07aaa9c4379931c5f2731da6cc1f81fbe3c229cbb67cd258ea3fad810bb17f981c870dc5683753b14c WHIRLPOOL c02f6974ea144e01c504f138b99a50e1fed2a76668b194ba002a2d39e2570c9d76e24098298cd63d63161166a5ea6d5279dfb708479963e49155345b1db8a513
-EBUILD normaliz-2.11.ebuild 1807 SHA256 85334b642a5c9852df78063f861f243c157e80049cdd0d78de4497c5ca34aa03 SHA512 1303e9803a6b87b03984997e679ae992c064abbb074eb422323efd929d1fc3aad78103ba39d91b38cd72841b1059cd4d4d6a7c7b0e0e5087622332bf5a76bbe7 WHIRLPOOL 3842b1a7d2e7042f94c07ed8f2cee17d335f113402bb8b1bfe0df76b800c109def065c7502e02f6d2ec07e5e9e82f11ac78810a370dfe9607c81b4bed94a6950
-EBUILD normaliz-2.12.1.ebuild 1831 SHA256 44dd20aa393636102b85e4435fa96d31c1978fdfda025995691af74cb871c316 SHA512 1f895e08611398cb838bf5ac04f4b811fe859df6adfec4ddcd0e9d90bb511bbf77adeeeb824795c53a8ee77c01ef80869e483ea447006dbedef3ae6f29bd3573 WHIRLPOOL 436089581b1b99f9184cfc537c673118579fe8b21742df8db3aefa049e2a6fc0d9b4fb6be333a805994c463b0e7e2ad02f9eec8650a2e5ab3856fd133f7d4a22
+EBUILD normaliz-2.12.2.ebuild 1839 SHA256 f56616f1058a8ff24c05d3457dadaad7fb4247f631398d68e6f647f29b9c408a SHA512 bc107f183535f97b564040d9b626998c01de5d9b698c775d0fee376213cc48b7158343550a5072759bad63356faae9406f3c00cfa8f0aac9586f8bee4d0aaafa WHIRLPOOL a7df3d9235c69957d8d702e106649a339f42c9775fb05f1b150cbf6f309d703cb900a64b527165d45624c13e63e8f58096e3ccb451834027aafece7f9187aa35
 EBUILD normaliz-2.5-r1.ebuild 1559 SHA256 a85d9cfeea85559f82ddd26f3ed69274d4e40e2efa513feccf2f293c5ef78b9d SHA512 6b3dbb6647938121dcc6fec621387cba104927420deeb1d9dfabc7a5f9e4bc606525a9c9e4c8e0880910a52081c690e0c22b8934c31bf2462ff41803f39feeec WHIRLPOOL 84fb7b3e7a6dc1bf27cd9a76b45fe2b399b9fa79a315557ef88417e41116aa48e53682edab0dc9709c2afe365277ba56e22e2841adb98b7ca08c233183737d76
-MISC ChangeLog 3303 SHA256 ba4910df00ecb7f55f674d21e99eb2c8f0c842daaac02d6bf495272025ead2c5 SHA512 dca52ad596f8c407dbe074a4fb32219510808934afc4bf62fbffda58c38221a8aceb79120748d06dbd62f1a27c5f61e055a79ad7d32b03beed000a5e9c594803 WHIRLPOOL 8581bc1ef3145996ab6bf46e7319dda5e7cf4549eb7f8dc0441ba7751566733612e7aa6d83b66cbe773ac617b2488583125798fd668add0acf3f62c5dba0ab59
+MISC ChangeLog 3528 SHA256 4aff1624b2064137bcfd0258d0547e869886309161dce727e30e543c37c18a9a SHA512 2bd42698fbb86b8d9b6870d66c79c67c7a565f80b2871c30b6037790198295c829ed01a1595e7498715abb678f87a2282b780a749d7c48e37669f334a635f217 WHIRLPOOL e47feae553d7f353e631060822529526ba15082b2f4dd7dff3d65ac73e30b8e2f0fd064d257c305f369f492980c3288e7b226592debd5b52c639d5570ecf639a
 MISC metadata.xml 616 SHA256 82c05970a971097431b4bde6e09350531ba376163fcb471bfbdfc8eed0676a83 SHA512 bbdb4f07547fbda1d6eeaced642eb16297feb04ee1bc3fc4e09c760e46d87cc8ed5a116fa87e743a863193a501b69d9008b540f6b3d793694b1e7b5b47ba3ca5 WHIRLPOOL 281e6fa8577a7bfda09c07718137b3f00c993a82f92c3118c17c118342cc87fcda4f2c2f55625a1b827f06b8410cb1c0256abd92a67bfb592dc002957b0532ee
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlRLpHcACgkQid6yGVZcMryxZQD9GAjo2T+ZlmVXXr3gcJJdz2dA
-d0QO5q4gdjcpAXsL0LkA/Rim66WWD3jLHHm9VhIjRs8tWCNkZJZYUD7DnqtjM/QE
-=Sj4/
+iF4EAREIAAYFAlTKBZcACgkQid6yGVZcMrzFlgEAhiohEuphY0XW5Tc+S1uwujQE
+j5myH91oZArjubXDLAwA/i9GywgA6/NVJJ7uXano7a8IFPLpUqQ/Z7irBhWJHtgL
+=Z5D9
 -----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
deleted file mode 100644
index 6d5c15f18202..000000000000
--- a/sci-mathematics/normaliz/files/normaliz-2.11-respect-flags.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-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
deleted file mode 100644
index 22c648075865..000000000000
--- a/sci-mathematics/normaliz/normaliz-2.11.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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.2 2014/06/09 09:56:12 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 || 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
-	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
-}
diff --git a/sci-mathematics/normaliz/normaliz-2.12.1.ebuild b/sci-mathematics/normaliz/normaliz-2.12.2.ebuild
index 4601275247fa..027b7eb1e88c 100644
--- a/sci-mathematics/normaliz/normaliz-2.12.1.ebuild
+++ b/sci-mathematics/normaliz/normaliz-2.12.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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 $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/normaliz/normaliz-2.12.2.ebuild,v 1.1 2015/01/29 10:02:44 tomka Exp $
 
 EAPI=5
 
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${MYP}
 
 src_prepare () {
-	epatch "${FILESDIR}/${P}-respect-flags.patch"
+	epatch "${FILESDIR}/${PN}-2.12.1-respect-flags.patch"
 
 	# Respect users AR tool (Bug 474532)
 	sed -e "s:ar -cr:$(tc-getAR) -cr:" -i source/libnormaliz/Makefile || die