gentoo resync : 30.06.2019

12 files changed, 154 insertions, 46 deletions

diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 7027d8f3a4f3..117912751346 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/gfan/Manifest b/sci-mathematics/gfan/Manifest
index 916b81f7701f..d94f1b5885bc 100644
--- a/sci-mathematics/gfan/Manifest
+++ b/sci-mathematics/gfan/Manifest
@@ -1,5 +1,7 @@
 AUX gfan-0.5-double-declare-fix.patch 470 BLAKE2B e5d12f62b2efe9781f616825dce16cab9cf5181358c466945577ca2666e89d5f223572a0ef530644aaf1e1c345ce8942e7826f37134263ef2f83d0cf569dc6cd SHA512 25f340d5636c1cc719328a00561d9c4e5ab3a67633a9fb0ceb23ca0c771fe579f60678649affdf5be76d189f43a986eecd13a91d9681e847ed8b7c1c4c4ed118
+AUX gfan-0.5-fix-build-system.patch 1349 BLAKE2B bce148ee12c3fd720baeccc6a75b0b66ed76f1bb7d1b7ef92c3d67ab26a4743502169b0fbac87b24496f5319adc85dbed1c4efdc1dfb68ecaf795f2d7441d4f1 SHA512 e53e7ec77ef18fa05f14ab0aa011b524439d4c4bdad79d2e197bde1e136df1c2ca043287d17722140ea79351969d87df29eb845ac441f9703c7c786bd6ac582e
+AUX gfan-0.5-fix-gcc9.patch 3712 BLAKE2B fd8b89d8f3019db71ea9bba05a8652666ddef6d35dd75cc97510cf96267ce1cc651375cfb9e269ab765b5bc3c30c0b33cbf73d1a74eea8a564a3d5482c15af28 SHA512 6c1186c2a549191b4db31433ca006de7d916bb43b2a9176f83b0c6516ac757f693721c355aff8b1669987b6db862858b4f428cc372f6787a0f4503242bb5e035
 AUX gfan-0.5-gcc6.1-compat.patch 2000 BLAKE2B 0ba13745140bb56d3398669e453cd245ee31c351ee3899dbded117ad48a238e99306c0c08b050168ddd204f4f30840ab8f04a609b135b782a06522cf65236995 SHA512 daf9527baf68299063ccdd82b53e92a63584fd5cf432b2d889c4aad08ccff0a31c0a75a7b6defd018021df4f46831ed7727a1bd6ea1b0da1fe9a924f9b208fe9
 DIST gfan0.5.tar.gz 1134987 BLAKE2B 73ea793f5dbceb76a9f143a258ee3e38e1466e4e15ed96dbabb58f33d3a091a885479dd00f8179d3bf2c85cf275605823f63aa33272f1f9984e0fc5841ab35e9 SHA512 11a9657adcd5b39f73244450c09b132d8cd19474d0f9151c0127682bc16847537e4096d39e8a0a63b5c6aef6720e54a72bfd361a5271808d5a5595fd2df494fa
-EBUILD gfan-0.5-r1.ebuild 856 BLAKE2B a27799165dc58dad7860075ca4d686a1f25b91284bf54814c47f0b1fe96ee0b12c7f6edfe8b92f19a98541b9fe90b4a8d445a0dec258f9eb244ae750f79745bf SHA512 b44f8316297138a2d1c0570b1fbaaa2a26122c28746ddec3bef31319e8ce319bd75084d480dcad61b867988da43d4d632c13a71e3afd732ac7daf0daa3c5509c
+EBUILD gfan-0.5-r1.ebuild 803 BLAKE2B efaa6db36e8f2c593ef82779cbbd9806197198d4150d785e7df5d5605e167fe11f172703723a89357fc23697f00c5ffd642be1a3dbac412b8b67f175cb524427 SHA512 c47d99455abbd85d48909d59a23408271015a3a1b9f6a79b2b26aa390769c41e32ae6ab2f89e29f9cddc0b5db217c619f2eee0cddfe5a9bab670196ac3ac10fa
 MISC metadata.xml 398 BLAKE2B 3c18380c694b7ac7114c6d83f65b9334a85c6afa5936bb5af9cb5eca2052b416eca08dfd5085d381589976d2ac1e3bbdf09a28757810cf54beb351b89dbcc46b SHA512 ac0668f6b8af01557b5a29a5aab5f6064f77eaed62e3fc080a5c808a62310dedd935271f58035e7c9b340df582922d2a960f67f148d61779a9a64fc1fbf7457e
diff --git a/sci-mathematics/gfan/files/gfan-0.5-fix-build-system.patch b/sci-mathematics/gfan/files/gfan-0.5-fix-build-system.patch
new file mode 100644
index 000000000000..3bf96ed088ce
--- /dev/null
+++ b/sci-mathematics/gfan/files/gfan-0.5-fix-build-system.patch
@@ -0,0 +1,55 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,5 @@
+ ALL: default
+ 
+-# GPROFFLAG = -pg
+- GPROFFLAG = -g
+ 
+ PREFIX?=/usr/local
+ 
+@@ -77,16 +75,13 @@
+ 
+ SHELL       = /bin/sh
+ #ARCH        = LINUX
+-CC          = gcc
+ CLINKER     = $(CC)
+-CXX         = g++
+ CCLINKER    = $(CXX)
+-#OPTFLAGS    = -O2 -DGMPRATIONAL -DNDEBUG
+-OPTFLAGS    = -O2 -DGMPRATIONAL -Wuninitialized
+ 
+-CFLAGS	  = $(OPTFLAGS) $(GPROFFLAG) $(ADDITIONALINCLUDEOPTIONS) #-pedantic
+-CCFLAGS	  = $(CFLAGS)
+-FFLAGS	  = $(OPTFLAGS)
++
++CFLAGS      += $(GPROFFLAG) $(ADDITIONALINCLUDEOPTIONS) -Wuninitialized
++CXXFLAGS    += $(GPROFFLAG) $(ADDITIONALINCLUDEOPTIONS) -Wuninitialized
++CPPFLAGS    += -DGMPRATIONAL -DNDEBUG
+ 
+ CATSOBJECTS =	$(GCATSPATH)lp_cdd.o \
+ 		$(SOPLEX_OBJECTS) \
+@@ -317,7 +312,7 @@
+ default: $(OBJECTS) $(ADDITIONALOBJECTS) $(EXECS)
+ 
+ $(MAIN): $(OBJECTS)
+-	$(CCLINKER) $(OBJECTS) $(ADDITIONALLINKOPTIONS) $(GPROFFLAG) -o $(MAIN)
++	$(CCLINKER) $(LDFLAGS) $(OBJECTS) $(ADDITIONALLINKOPTIONS) $(GPROFFLAG) -o $(MAIN)
+ 
+ release:
+ 	rm -f -r $(RELEASEDIR)/*
+@@ -430,14 +425,6 @@
+ 	cp gfanlib.h gfanlib/
+ 	cp gfanlib_* gfanlib/
+ 	tar zcf -  gfanlib > gfanlib.tar.gz
+-.c.o:
+-	$(CC) $(CFLAGS) -c $<
+-.cc.o:
+-	$(CXX) -c $<
+-.cpp.o:
+-	$(CXX) $(CFLAGS) -c $<
+-.C.o:
+-	$(CXX) -c $<
+ # wget http://ftp.sunet.se/pub/gnu/gmp/gmp-4.2.2.tar.gz
+ # tar -xzvf gmp-4.2.2.tar.gz
+ # cd gmp-4.2.2
diff --git a/sci-mathematics/gfan/files/gfan-0.5-fix-gcc9.patch b/sci-mathematics/gfan/files/gfan-0.5-fix-gcc9.patch
new file mode 100644
index 000000000000..930baf9edcf2
--- /dev/null
+++ b/sci-mathematics/gfan/files/gfan-0.5-fix-gcc9.patch
@@ -0,0 +1,68 @@
+https://bugs.gentoo.org/686484
+
+polyhedralfan.h: At global scope:
+polyhedralfan.h:77:24: error: friend declaration of ‘PolyhedralFan refinement(const PolyhedralFan&, const PolyhedralFan&, int, bool)’ specifies default arguments and isn’t a definition [-fpermissive]
+   77 |   friend PolyhedralFan refinement(const PolyhedralFan &a, const PolyhedralFan &b, int cutOffDimension=-1, bool allowASingleConeOfCutOffDimension=false);
+      |                        ^~~~~~~~~~
+
+--- a/gfanlib_polyhedralfan.h
++++ b/gfanlib_polyhedralfan.h
+@@ -24,6 +24,8 @@
+ typedef std::map<int,IntVectorList> IncidenceList;
+ 
+ 
++class PolyhedralFan;
++PolyhedralFan refinement(const PolyhedralFan &a, const PolyhedralFan &b, int cutOffDimension=-1, bool allowASingleConeOfCutOffDimension=false);
+ 
+ /** A PolyhedralFan is simply a collection of canonicalized PolyhedralCones.
+  * It contains no combinatorial information in the sense of a polyhedral complex.
+@@ -52,7 +54,7 @@
+   int getAmbientDimension()const;
+   int getMaxDimension()const;
+   int getMinDimension()const;
+-  friend PolyhedralFan refinement(const PolyhedralFan &a, const PolyhedralFan &b, int cutOffDimension=-1, bool allowASingleConeOfCutOffDimension=false);
++  friend PolyhedralFan refinement(const PolyhedralFan &a, const PolyhedralFan &b, int cutOffDimension, bool allowASingleConeOfCutOffDimension);
+   ZMatrix getRays(int dim=1);//This can be called for other dimensions than 1. The term "Rays" still makes sense modulo the common linearity space
+   ZMatrix getRelativeInteriorPoints();
+   void insert(ZCone const &c);
+--- a/halfopencone.h
++++ b/halfopencone.h
+@@ -6,6 +6,9 @@
+ 
+ #include "polyhedralfan.h"
+ 
++class HalfOpenCone;
++HalfOpenCone intersection(const HalfOpenCone &a, const HalfOpenCone &b, bool findFacets=false);
++
+ class HalfOpenCone{
+   static void appendList(IntegerVectorList &to, IntegerVectorList const &from, int appendValue);
+   int liftedDimension;//ambient
+@@ -18,7 +21,7 @@
+   HalfOpenCone(int dimension_, IntegerVectorList const &equations, IntegerVectorList const &nonstrict, IntegerVectorList const &strict, bool findFacets=false, bool canonicalize=false);
+   HalfOpenCone(int ambientDimension);//full space
+   bool isEmpty();
+-  friend HalfOpenCone intersection(const HalfOpenCone &a, const HalfOpenCone &b, bool findFacets=false);
++  friend HalfOpenCone intersection(const HalfOpenCone &a, const HalfOpenCone &b, bool findFacets);
+   friend bool haveEmptyIntersection(const HalfOpenCone &a, const HalfOpenCone &b);
+   PolyhedralCone closure();
+   void splitIntoRelativelyOpenCones(list<HalfOpenCone> &l);
+--- a/polyhedralfan.h
++++ b/polyhedralfan.h
+@@ -30,6 +30,8 @@
+   FPF_default=2+4+8
+ };
+ 
++class PolyhedralFan;
++PolyhedralFan refinement(const PolyhedralFan &a, const PolyhedralFan &b, int cutOffDimension=-1, bool allowASingleConeOfCutOffDimension=false);
+ 
+ /** A PolyhedralFan is simply a collection of canonicalized PolyhedralCones.
+  * It contains no combinatorial information in the sense of a polyhedral complex.
+@@ -74,7 +76,7 @@
+   int getAmbientDimension()const;
+   int getMaxDimension()const;
+   int getMinDimension()const;
+-  friend PolyhedralFan refinement(const PolyhedralFan &a, const PolyhedralFan &b, int cutOffDimension=-1, bool allowASingleConeOfCutOffDimension=false);
++  friend PolyhedralFan refinement(const PolyhedralFan &a, const PolyhedralFan &b, int cutOffDimension, bool allowASingleConeOfCutOffDimension);
+   friend PolyhedralFan product(const PolyhedralFan &a, const PolyhedralFan &b);
+   IntegerVectorList getRays(int dim=1);//This can be called for other dimensions than 1. The term "Rays" still makes sense modulo the common linearity space
+   IntegerVectorList getRelativeInteriorPoints();
diff --git a/sci-mathematics/gfan/gfan-0.5-r1.ebuild b/sci-mathematics/gfan/gfan-0.5-r1.ebuild
index ec591ee19578..1cd8c95fbecf 100644
--- a/sci-mathematics/gfan/gfan-0.5-r1.ebuild
+++ b/sci-mathematics/gfan/gfan-0.5-r1.ebuild
@@ -1,38 +1,37 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
-DESCRIPTION="computes Groebner fans and tropical varities"
+DESCRIPTION="Compute Groebner fans and tropical varities"
 HOMEPAGE="http://www.math.tu-berlin.de/~jensen/software/gfan/gfan.html"
 SRC_URI="http://www.math.tu-berlin.de/~jensen/software/gfan/${PN}${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
-DEPEND="dev-libs/gmp[cxx]
-	sci-libs/cddlib"
+DEPEND="
+	dev-libs/gmp:0=[cxx]
+	sci-libs/cddlib:0="
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}${PV}/"
 
 PATCHES=(
-	"${FILESDIR}/${P}-double-declare-fix.patch"
-	"${FILESDIR}/${P}-gcc6.1-compat.patch"
-	)
-
-src_prepare () {
-	default
-	sed -i -e "s/-O2/${CXXFLAGS}/" \
-		-e "/GPROFFLAG =/d" \
-		-e "s/g++/$(tc-getCXX)/" \
-		-e "s/\$(CCLINKER)/& \$(LDFLAGS)/" Makefile || die
+	"${FILESDIR}"/${P}-double-declare-fix.patch
+	"${FILESDIR}"/${P}-gcc6.1-compat.patch
+	"${FILESDIR}"/${P}-fix-build-system.patch
+	"${FILESDIR}"/${P}-fix-gcc9.patch
+)
+
+src_configure() {
+	tc-export CXX
 }
 
 src_install() {
 	emake PREFIX="${ED}/usr" install
+	einstalldocs
 }
diff --git a/sci-mathematics/gmp-ecm/Manifest b/sci-mathematics/gmp-ecm/Manifest
index 938ec74eab1e..96d588f0ca47 100644
--- a/sci-mathematics/gmp-ecm/Manifest
+++ b/sci-mathematics/gmp-ecm/Manifest
@@ -1,6 +1,6 @@
 DIST gmp-ecm-6.4.3.tar.gz 944719 BLAKE2B aa07f0b6c4a4b0d3bb36b596ddbaefd259b2387fa0295a829c8e239b0edde0e1f3887bff19a6b0b67083cbec7706fa41214a21eeca8b83eb4b3f7e3cc372c113 SHA512 71ccdf3b48e96b0acad45302c87a7b17a20ad289efde212a34fb11491531b96848f1824606fdab7604874ca7d8165baba4bbfbc8424e27e8844444ad0d4f56a6
 DIST gmp-ecm-6.4.4.tar.gz 941058 BLAKE2B e83f02592a8bb86285f258fefc3e302cc5168888109e7f87835b25412baf526df58e5ea38347acfd926b90fac15b4103981a14aa7b853dba0cb0168467a223e0 SHA512 039009de2d1a22de7abed2e2b843fa2bc684ddcfc45892891a24b93ad4b3640a97d2e7612ebcbdbca8db032534c226ad77c67199772b21a6139e5fa205687097
-EBUILD gmp-ecm-6.4.3-r5.ebuild 1527 BLAKE2B ff28b3adcca09b3ab3d2eefa726e5e05a2dd14695c4227b1e44d4cd3a1efe9244c6e89308ed9c40dd328b7300a0ea563129d872abc82930533b7288d3899ce70 SHA512 c24c1ae83890157b556f8bdf50602ad89ccb9b121a393c49a6d15c5c1e0f936752712e80acf275844f7bf30abe3309f2eb2a351b9191e7208c111f9a89abc31b
-EBUILD gmp-ecm-6.4.4-r1.ebuild 1649 BLAKE2B 336507114de5d498400ed10a4430baa505287eeae8db3342f752e19085fab61cc73445f35b04eb2f9a2acd8c70a3f008017c62da62f6a55227e10793f5027180 SHA512 1428f77708781c19dff5ff426821dcc8a1e3f612186993fcb4aa9280c31eed2909d5637d7d8ab7d6d461b1377c5ea2d5ccb1b1fd5f80384c89a87d3f0bfa2e31
-EBUILD gmp-ecm-9999.ebuild 1183 BLAKE2B a312792af052cb90da0a4d6c82fd8edc64adee8e5dffb17093590f28b6e03d6e835f74298a45c200162e0e21be57de63c71116a327d555b13967afbc3886425e SHA512 8228893e6e7392e2ba8dafa8479cf960870b0944dd5e40a3b3e3d9f37db4bea21430605d06bf168c089dd8fb95ac4a88e73793e81be058b84cc4f326c810c76c
-MISC metadata.xml 443 BLAKE2B b8c872472a6171a9e08e3e4f356eb792c601bb3aa6b439d7dbd4c0ecfa2732482d7321378036f8970d75616364cbe25827febda5634c8b1ec6bf9754961b1713 SHA512 6da5d2c056bb4924e15ed21993ad60755616a59be5fb0b5a94f9869f3ff03ed45df9512e2b22e29d65b27b32d4a8d97cfeb99559e0c0682333485f8d187c4b46
+EBUILD gmp-ecm-6.4.3-r5.ebuild 1370 BLAKE2B ad6bf30df573f77c458268b81d63157cb66ef6b0a9b6a99a2eccef27c70caac2ba51eda8d056781712fe8aa33a65128aa742ac3ac5ba5914145882a8401345ba SHA512 6c2e766207e64b1b4837720f39f99e7efc644218178a44ad994585e2febc3c13b70a2c684a89964834ccdddac6d7f60d63543b7d5f8eba90906c85f760bfb513
+EBUILD gmp-ecm-6.4.4-r1.ebuild 1474 BLAKE2B cf8ce605ccdb5a1b26db33a01989a06b8395840a84c700f7e420e8b69edc0bf4a91e03f84ce66e2d13184b10212c1e375c273d67c043adbf57e99b7462fc93eb SHA512 da6edd387bef9b397d431ee5ac7700e651a9751fb7aff1413151bf7a7f1e312def417514c7ff536a454c5b46f7405a26ad5fdbecf743f0d667313a1da6c00e22
+EBUILD gmp-ecm-9999.ebuild 1026 BLAKE2B 26e3b858f684136f9909a00f58240359cb6f09cafb64276e1c14efc7d26f13dc9b676809c8bf8d8b3b3342847b87de2b19ba5f37096a975e870694a6fb082cd3 SHA512 2f4314e9578bdc129af573c540e2f4cb26549a5a5bbfd640bdcdd50afc55b6bd05f10486a0382be4f13d4c4fac3dc93bcffd44faddfbafcafdaaf9b64d2cc579
+MISC metadata.xml 384 BLAKE2B 168807abd87bddc88522015f01126d5ec0bde8716aa38b6e619054d39e9bb12a6ffdaa3082328ecb56c0398b498c964c8e28c818d3887919fbe3065a28673f2a SHA512 a8a7aa64869c88ac293347281a80158cbd3cc84fc9f5ca56531d3d53b33601f9baa5c4f66c93508d6763dc54779a563faa09c4a473c670a9b217610efecca25c
diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-6.4.3-r5.ebuild b/sci-mathematics/gmp-ecm/gmp-ecm-6.4.3-r5.ebuild
index e60693532085..0a752d428d6e 100644
--- a/sci-mathematics/gmp-ecm/gmp-ecm-6.4.3-r5.ebuild
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-6.4.3-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -11,22 +11,17 @@ inherit eutils
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+blas +custom-tune gwnum -openmp test"
+IUSE="+blas +custom-tune -openmp test"
 
 # gmp 5.1 breaks a few things with this version
 DEPEND="<dev-libs/gmp-5.1.0
 	blas? ( sci-libs/gsl )
-	gwnum? ( sci-mathematics/gwnum )
 	openmp? ( sys-devel/gcc[openmp] )"
 RDEPEND="${DEPEND}"
 
-# can't be both enabled
-REQUIRED_USE="gwnum? ( !openmp )"
-
 S=${WORKDIR}/ecm-${PV}
 
 src_configure() {
-	if use gwnum; then myconf="--with-gwnum=/usr/lib"; fi
 	# --enable-shellcmd is broken
 	econf $(use_enable openmp) $myconf
 }
diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-6.4.4-r1.ebuild b/sci-mathematics/gmp-ecm/gmp-ecm-6.4.4-r1.ebuild
index 209011200da1..29e28d2fc9cf 100644
--- a/sci-mathematics/gmp-ecm/gmp-ecm-6.4.4-r1.ebuild
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-6.4.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,18 +12,14 @@ SRC_URI="https://gforge.inria.fr/frs/download.php/32159/${P}.tar.gz"
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+blas +custom-tune gwnum -openmp static-libs test"
+IUSE="+blas +custom-tune -openmp static-libs test"
 
 DEPEND="
 	dev-libs/gmp:0=
 	blas? ( sci-libs/gsl )
-	gwnum? ( sci-mathematics/gwnum )
 	openmp? ( sys-devel/gcc:*[openmp] )"
 RDEPEND="${DEPEND}"
 
-# can't be both enabled
-REQUIRED_USE="gwnum? ( !openmp )"
-
 S=${WORKDIR}/ecm-${PV}
 
 MAKEOPTS+=" -j1"
@@ -34,7 +30,6 @@ src_prepare() {
 }
 
 src_configure() {
-	use gwnum && local myconf="--with-gwnum="${EPREFIX}"/usr/$(get_libdir)"
 	# --enable-shellcmd is broken
 	econf \
 		--enable-shared \
diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-9999.ebuild b/sci-mathematics/gmp-ecm/gmp-ecm-9999.ebuild
index a7936e1d8eab..728b19ecd527 100644
--- a/sci-mathematics/gmp-ecm/gmp-ecm-9999.ebuild
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,18 +13,14 @@ inherit autotools eutils flag-o-matic subversion
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="blas gwnum -openmp test"
+IUSE="blas -openmp test"
 
 DEPEND="
 	dev-libs/gmp:0=
 	blas? ( sci-libs/gsl )
-	gwnum? ( sci-mathematics/gwnum )
 	openmp? ( sys-devel/gcc:*[openmp] )"
 RDEPEND="${DEPEND}"
 
-# can't be both enabled
-REQUIRED_USE="gwnum? ( !openmp )"
-
 S=${WORKDIR}/ecm-${PV}
 
 MAKEOPTS+=" -j1"
@@ -34,7 +30,6 @@ src_prepare() {
 }
 
 src_configure() {
-	if use gwnum; then myconf="--with-gwnum=/usr/lib"; fi
 	# --enable-shellcmd is broken
 	econf $(use_enable openmp) $myconf
 }
diff --git a/sci-mathematics/gmp-ecm/metadata.xml b/sci-mathematics/gmp-ecm/metadata.xml
index 928a8daa2073..b5bb0a9997ee 100644
--- a/sci-mathematics/gmp-ecm/metadata.xml
+++ b/sci-mathematics/gmp-ecm/metadata.xml
@@ -7,6 +7,5 @@
   </maintainer>
   <use>
     <flag name="custom-tune">Improve performance of some operations by selecting machine-specific defaults</flag>
-    <flag name="gwnum">Use GWNum lib where possible</flag>
   </use>
 </pkgmetadata>
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 10fceb94bcc6..fb5061c15e71 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -15,5 +15,5 @@ DIST octave-4.4.0.tar.gz 29009355 BLAKE2B 3f7b4a6e1262cd0009f8649a570749acc2dc8b
 DIST octave-4.4.1.tar.gz 28626462 BLAKE2B 0ea7a9b5840c7afdf20dff36e896b37c1c69eb8799ba48722c02f9636591b849f26f56720a75293c11c1000d0088e07373aa84ef7d360436eb095fc0a2e721a6 SHA512 21a1f13e2145fa530f2169254d19442b572745d65b91453ba1f552f6eda6aecfead57dbe0260b3293a29db0aa0f27cfd4f26df332e6d640848a822b20c1232f8
 EBUILD octave-4.2.2.ebuild 5112 BLAKE2B 2f08b20c4557a30b1b8bb3608c400805cf21af1f438ffc8e5f8cc54576b5c6116bfc009bb29c33b9a4f69e29e0f423994fda8cc4b04967209179d4a90a7d7d7d SHA512 4a033bec4259b063ed3c5008881c6ff57e061e7e769b9481f3dd14af3e004711d0a9f221b0afc9fce83386d102062d84d0813fd01cee3b240f4266b0c0371039
 EBUILD octave-4.4.0.ebuild 5092 BLAKE2B c78da0de6de2550d58131a36336d49d021ef203c42f3f1889913c01d1b0ee24af2c446bb30d6f56043c368d7ec3943d50637a939e65638bbd6ddba6030054614 SHA512 fc3e27c85ed9a5e54ce3acad53bd8d6122dace79b62cb02a155a4abe93c75209f883556761ed20ef78e6a64d8dc97c6c876b9f3a918898119db46cbef21d66dc
-EBUILD octave-4.4.1.ebuild 5186 BLAKE2B 7184fc80f07db1e5098a791e63682379b46024b4e0fd4b32ff0f09d90f078e51a5c0c4208bfe216a1a3523ba81a2c87f6358f8463b08215caf14311b9630ea27 SHA512 8466f20e81594f9d7189a2b19f74199dd529b0631dbd60907b920616c74f84242757389f933f78e0009cc9073607db4b21f1f426743ba14293060700d2b8b101
+EBUILD octave-4.4.1.ebuild 5190 BLAKE2B 6aeaf6fb0c50188027786ed55fd63f223a6d403ded9fa5736b0883aa0c3d443cc3147bd1fcfef6ea011e1f023057ba3fe90c29cb3e406d1f293f3a72698eefbe SHA512 726b0787936c803a03ff1669c1cdf5d29f926c13fe1c2010802829098a62502c0245ad69cad476b8d4149e7f97f2ca5c680fd553cc6708159654a61ad0434ed7
 MISC metadata.xml 1199 BLAKE2B f1daa0330bdc0362c68458ce6e7145118dd8a9d1a3bcbcc76c04ccdffe700c9d6f71b5e8b7f05b5ed0154352a213ce7b5177284919362585fedb0dbd8b68cbca SHA512 aebb1728f0ca59ba83b649eea72c267c530efc0b97b12f0d7958ba8de0f482fcb37245cf93bc188c9368686e0feafc44da4a7dd97d6bab8246309945fee8f7a4
diff --git a/sci-mathematics/octave/octave-4.4.1.ebuild b/sci-mathematics/octave/octave-4.4.1.ebuild
index ac34dd412bb4..56a8b3b9eb35 100644
--- a/sci-mathematics/octave/octave-4.4.1.ebuild
+++ b/sci-mathematics/octave/octave-4.4.1.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
 	)
 	hdf5? ( sci-libs/hdf5:0= )
 	imagemagick? (
-		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+		!graphicsmagick? ( >=media-gfx/imagemagick-7:=[cxx] )
 		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
 	)
 	java? ( >=virtual/jre-1.6.0:* )