commit:     5394f2ed078e80cf22b8d957c3799e4808056a8f
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 23 18:13:44 2019 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jun 23 18:13:44 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5394f2ed

sci-mathematics/gmp-ecm: Remove dep on sci-mathematics/gwnum

Closes: https://github.com/gentoo/gentoo/pull/12313
Package-Manager: Portage-2.3.67, Repoman-2.3.15
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sci-mathematics/gmp-ecm/gmp-ecm-6.4.3-r5.ebuild | 9 ++-------
 sci-mathematics/gmp-ecm/gmp-ecm-6.4.4-r1.ebuild | 9 ++-------
 sci-mathematics/gmp-ecm/gmp-ecm-9999.ebuild     | 9 ++-------
 sci-mathematics/gmp-ecm/metadata.xml            | 1 -
 4 files changed, 6 insertions(+), 22 deletions(-)

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 e6069353208..0a752d428d6 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 209011200da..29e28d2fc9c 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 a7936e1d8ea..728b19ecd52 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 928a8daa207..b5bb0a9997e 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>

Reply via email to