Undo drop (bug #520160)

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

5 files changed, 70 insertions, 130 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/Manifest b/sci-mathematics/normaliz/Manifest
index 956de37d8bf9..ffb00d01241a 100644
--- a/sci-mathematics/normaliz/Manifest
+++ b/sci-mathematics/normaliz/Manifest
@@ -1,33 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+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 1827 SHA256 2788588a1937f7d27256f50c2ed744af71305452e5cd13a5e204378fddd223f8 SHA512 8e34b2d92005bb7f6a3966914d560c1880fcd47e25862d07aaa9c4379931c5f2731da6cc1f81fbe3c229cbb67cd258ea3fad810bb17f981c870dc5683753b14c WHIRLPOOL c02f6974ea144e01c504f138b99a50e1fed2a76668b194ba002a2d39e2570c9d76e24098298cd63d63161166a5ea6d5279dfb708479963e49155345b1db8a513
 EBUILD normaliz-2.11.ebuild 1807 SHA256 85334b642a5c9852df78063f861f243c157e80049cdd0d78de4497c5ca34aa03 SHA512 1303e9803a6b87b03984997e679ae992c064abbb074eb422323efd929d1fc3aad78103ba39d91b38cd72841b1059cd4d4d6a7c7b0e0e5087622332bf5a76bbe7 WHIRLPOOL 3842b1a7d2e7042f94c07ed8f2cee17d335f113402bb8b1bfe0df76b800c109def065c7502e02f6d2ec07e5e9e82f11ac78810a370dfe9607c81b4bed94a6950
-MISC ChangeLog 2917 SHA256 d3c6e9cfc35c264a977df67b7336d979bf4b81392bb2e546e3c4d5c27ad1cbcc SHA512 7728490a90ab0710b00e598ad6a7720425fa0daff5953778c1ffd430ecf20a19f3785116d4f8a36713bfc8426c0807c6c7ededdd99df087f313dda9396b83d5a WHIRLPOOL 6f2df458fee5113c7aa292f3f984988707d360c87e26799609b47aec2e3a39c33c8f6dd9d934d9648b01bf55e2f5e2564fd4003ecd6a9eababea41ed98119b7a
+EBUILD normaliz-2.5-r1.ebuild 1559 SHA256 a85d9cfeea85559f82ddd26f3ed69274d4e40e2efa513feccf2f293c5ef78b9d SHA512 6b3dbb6647938121dcc6fec621387cba104927420deeb1d9dfabc7a5f9e4bc606525a9c9e4c8e0880910a52081c690e0c22b8934c31bf2462ff41803f39feeec WHIRLPOOL 84fb7b3e7a6dc1bf27cd9a76b45fe2b399b9fa79a315557ef88417e41116aa48e53682edab0dc9709c2afe365277ba56e22e2841adb98b7ca08c233183737d76
+MISC ChangeLog 3135 SHA256 a82991c94c0844bd505d50850b792bedd69467012a0ab66c04f604a947a5396e SHA512 060dd6704f5ee8a190e7099b7a0a73f9a2aa76bb934f70fbd65fc1cf48eea04b48aa137b03a0b4ae78f03fa44cff2712681be7c65c7e2b23c98cbf8e5e74dd36 WHIRLPOOL 117542fa38c1f7513aef3ca3f558791ff590bae673610f43eca74aff997b9c086cd74ce72c0aebf287e9c0f071903b9da1b61872e8edf4bd76130689d25a230e
 MISC metadata.xml 616 SHA256 82c05970a971097431b4bde6e09350531ba376163fcb471bfbdfc8eed0676a83 SHA512 bbdb4f07547fbda1d6eeaced642eb16297feb04ee1bc3fc4e09c760e46d87cc8ed5a116fa87e743a863193a501b69d9008b540f6b3d793694b1e7b5b47ba3ca5 WHIRLPOOL 281e6fa8577a7bfda09c07718137b3f00c993a82f92c3118c17c118342cc87fcda4f2c2f55625a1b827f06b8410cb1c0256abd92a67bfb592dc002957b0532ee
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJT7cqmXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVireKIQAJoMPt3/mFBVZpOfEqhhI+I0
-vTXA6d9ubnJl8CozpMdNDwfdWnuP5kyj1XrUjCLn5xwj97ywkPwQXuumknX6Fxbg
-PmzIHKaN6Mmb2ZccW1dXBcYAu7ispzkS2gYju1T/0nYDKdcm/1ldXDw6v4Q3qgIv
-zNhOYXZpbKMdpfEQIfNRNnRm8Ys/Zb0n+vYfIwnj6xdmK3t4CUewJQ6PoKwGt2gn
-HjyjDmCAG/Mqc65cXTTjhEOrS2R0klk7W1lJmCV7U/zfssAG7k/o8T9ApOKahcCr
-46tGJe8Z6hpIb9w0Bw4i9rIoQFkCCZDtSBMsSE8GnWKRcyctAJYEv2UzWt0xvHLa
-BCpeaNiVNkaPOsbilnhKI1oct7xFMn5D8cq2LSQuWWJd7VgQcEK6Wd9Kcrwxu9zK
-BSBl+/gGzkjLSmWPZYhtPSjy7gtzFQP/fOj4gBDYaCdMaA2FLkXNZvz3gU+gRonm
-DpaEcA2RH2MJGMmpQE9nDMO9fWS6lNJMFLvC4BuKTHi6VgkmFfF9tWVQ6V0CeUbY
-Y0U7XMZTkKxReVVu5yarOak785kBHv4KjcoWWe3Em29FyYWA9/FH7vchuoG2Lopn
-a/hGz/+6eOo2wmPVoQK9rJd3TsSE+HA5tGVEG4tqHvP9dDhen6wDg1e46kZ4iq+A
-63LQg1kLpmpJGtokPAFn
-=IRtl
+iF4EAREIAAYFAlPxrGAACgkQid6yGVZcMryWCAD+LUCzxQ5dZzeYO6Id8Hca28KJ
+4Hla7nXxa6lAzXmpAo8A/1lKBCobneOp6P8BxwXNnoMCDJnXquptVwVClRzfaMY8
+=C1Vr
 -----END PGP SIGNATURE-----
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
+}