From aceaa732f5da4abba8b6cd3ab75a10ac2fe48302 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Mon, 14 Nov 2011 11:28:36 +0000 Subject: [PATCH] QA: cxx conditional was broken, fix it. Package-Manager: portage-2.2.0_alpha74/cvs/Linux x86_64 --- sci-mathematics/4ti2/4ti2-1.3.2-r1.ebuild | 4 ++-- sci-mathematics/4ti2/4ti2-1.3.2.ebuild | 4 ++-- sci-mathematics/4ti2/ChangeLog | 6 +++++- sci-mathematics/cgal/ChangeLog | 6 +++++- sci-mathematics/cgal/cgal-3.6.1.ebuild | 7 ++----- sci-mathematics/cgal/cgal-3.7.ebuild | 7 ++----- sci-mathematics/frobby/ChangeLog | 5 ++++- sci-mathematics/frobby/frobby-0.8.2-r1.ebuild | 4 ++-- sci-mathematics/gfan/ChangeLog | 6 +++++- sci-mathematics/gfan/gfan-0.4-r1.ebuild | 4 ++-- sci-mathematics/gfan/gfan-0.5.ebuild | 4 ++-- sci-mathematics/normaliz/ChangeLog | 6 +++++- sci-mathematics/normaliz/normaliz-2.5-r1.ebuild | 4 ++-- sci-mathematics/normaliz/normaliz-2.7.ebuild | 4 ++-- 14 files changed, 42 insertions(+), 29 deletions(-) diff --git a/sci-mathematics/4ti2/4ti2-1.3.2-r1.ebuild b/sci-mathematics/4ti2/4ti2-1.3.2-r1.ebuild index e9b381733095..5d83ebc3a2dc 100644 --- a/sci-mathematics/4ti2/4ti2-1.3.2-r1.ebuild +++ b/sci-mathematics/4ti2/4ti2-1.3.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/4ti2/4ti2-1.3.2-r1.ebuild,v 1.2 2011/11/13 19:30:50 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/4ti2/4ti2-1.3.2-r1.ebuild,v 1.3 2011/11/14 11:26:12 flameeyes Exp $ EAPI=4 @@ -17,7 +17,7 @@ IUSE="static-libs" DEPEND=" sci-mathematics/glpk[gmp] - || ( dev-libs/gmp[cxx] dev-libs/gmp[-nocxx] )" + dev-libs/gmp[cxx]" RDEPEND="${DEPEND}" AUTOTOOLS_IN_SOURCE_BUILD=1 diff --git a/sci-mathematics/4ti2/4ti2-1.3.2.ebuild b/sci-mathematics/4ti2/4ti2-1.3.2.ebuild index 37b3a646b2fd..1772e45739e9 100644 --- a/sci-mathematics/4ti2/4ti2-1.3.2.ebuild +++ b/sci-mathematics/4ti2/4ti2-1.3.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/4ti2/4ti2-1.3.2.ebuild,v 1.5 2011/11/13 19:30:50 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/4ti2/4ti2-1.3.2.ebuild,v 1.6 2011/11/14 11:26:12 flameeyes Exp $ EAPI=3 @@ -16,5 +16,5 @@ KEYWORDS="amd64 x86" IUSE="static-libs" DEPEND="sci-mathematics/glpk[gmp] - || ( dev-libs/gmp[cxx] dev-libs/gmp[-nocxx] )" + dev-libs/gmp[cxx]" RDEPEND="${DEPEND}" diff --git a/sci-mathematics/4ti2/ChangeLog b/sci-mathematics/4ti2/ChangeLog index f95a9666314a..6ed3f0b04ea7 100644 --- a/sci-mathematics/4ti2/ChangeLog +++ b/sci-mathematics/4ti2/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-mathematics/4ti2 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/4ti2/ChangeLog,v 1.5 2011/11/13 19:30:50 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/4ti2/ChangeLog,v 1.6 2011/11/14 11:26:12 flameeyes Exp $ + + 14 Nov 2011; Diego E. Pettenò 4ti2-1.3.2-r1.ebuild, + 4ti2-1.3.2.ebuild: + QA: cxx conditional was broken, fix it. 13 Nov 2011; Mike Frysinger 4ti2-1.3.2.ebuild, 4ti2-1.3.2-r1.ebuild: diff --git a/sci-mathematics/cgal/ChangeLog b/sci-mathematics/cgal/ChangeLog index 9b1977c00f5a..d412efd5a99f 100644 --- a/sci-mathematics/cgal/ChangeLog +++ b/sci-mathematics/cgal/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-mathematics/cgal # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/ChangeLog,v 1.9 2011/11/13 19:52:57 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/ChangeLog,v 1.10 2011/11/14 11:27:36 flameeyes Exp $ + + 14 Nov 2011; Diego E. Pettenò cgal-3.6.1.ebuild, + cgal-3.7.ebuild: + QA: cxx conditional was broken, fix it. 13 Nov 2011; Mike Frysinger cgal-3.6.1.ebuild, cgal-3.7.ebuild: diff --git a/sci-mathematics/cgal/cgal-3.6.1.ebuild b/sci-mathematics/cgal/cgal-3.6.1.ebuild index 65f1524f6b48..6ae4a00590bc 100644 --- a/sci-mathematics/cgal/cgal-3.6.1.ebuild +++ b/sci-mathematics/cgal/cgal-3.6.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/cgal-3.6.1.ebuild,v 1.2 2011/11/13 19:52:57 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/cgal-3.6.1.ebuild,v 1.3 2011/11/14 11:27:36 flameeyes Exp $ EAPI=3 CMAKE_BUILD_TYPE=Release @@ -25,10 +25,7 @@ RDEPEND="dev-libs/boost sys-libs/zlib x11-libs/libX11 virtual/opengl - gmp? ( - dev-libs/gmp - || ( dev-libs/gmp[cxx=] dev-libs/gmp[-nocxx] ) - ) + gmp? ( dev-libs/gmp[cxx=] ) lapack? ( virtual/lapack ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-opengl:4 )" diff --git a/sci-mathematics/cgal/cgal-3.7.ebuild b/sci-mathematics/cgal/cgal-3.7.ebuild index 603f1d7664ee..9b33392b8b64 100644 --- a/sci-mathematics/cgal/cgal-3.7.ebuild +++ b/sci-mathematics/cgal/cgal-3.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/cgal-3.7.ebuild,v 1.2 2011/11/13 19:52:57 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/cgal-3.7.ebuild,v 1.3 2011/11/14 11:27:36 flameeyes Exp $ EAPI=3 CMAKE_BUILD_TYPE=Release @@ -25,10 +25,7 @@ RDEPEND="dev-libs/boost sys-libs/zlib x11-libs/libX11 virtual/opengl - gmp? ( - dev-libs/gmp - || ( dev-libs/gmp[cxx=] dev-libs/gmp[-nocxx] ) - ) + gmp? ( dev-libs/gmp[cxx=] ) lapack? ( virtual/lapack ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-opengl:4 )" diff --git a/sci-mathematics/frobby/ChangeLog b/sci-mathematics/frobby/ChangeLog index ac8f78255ca9..f4749e4e2dea 100644 --- a/sci-mathematics/frobby/ChangeLog +++ b/sci-mathematics/frobby/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sci-mathematics/frobby # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/frobby/ChangeLog,v 1.6 2011/11/13 19:40:00 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/frobby/ChangeLog,v 1.7 2011/11/14 11:26:47 flameeyes Exp $ + + 14 Nov 2011; Diego E. Pettenò frobby-0.8.2-r1.ebuild: + QA: cxx conditional was broken, fix it. 13 Nov 2011; Mike Frysinger frobby-0.8.2-r1.ebuild: Convert gmp[-nocxx] to gmp[cxx]. diff --git a/sci-mathematics/frobby/frobby-0.8.2-r1.ebuild b/sci-mathematics/frobby/frobby-0.8.2-r1.ebuild index 35aee5cab73d..035581619694 100644 --- a/sci-mathematics/frobby/frobby-0.8.2-r1.ebuild +++ b/sci-mathematics/frobby/frobby-0.8.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/frobby/frobby-0.8.2-r1.ebuild,v 1.6 2011/11/13 19:40:00 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/frobby/frobby-0.8.2-r1.ebuild,v 1.7 2011/11/14 11:26:47 flameeyes Exp $ EAPI=2 @@ -15,7 +15,7 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="doc" -RDEPEND="|| ( dev-libs/gmp[cxx] dev-libs/gmp[-nocxx] )" +RDEPEND="dev-libs/gmp[cxx]" DEPEND="${RDEPEND} doc? ( virtual/latex-base )" diff --git a/sci-mathematics/gfan/ChangeLog b/sci-mathematics/gfan/ChangeLog index 3ea06088dba6..5c7bc42e1074 100644 --- a/sci-mathematics/gfan/ChangeLog +++ b/sci-mathematics/gfan/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-mathematics/gfan # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gfan/ChangeLog,v 1.6 2011/11/13 19:41:07 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gfan/ChangeLog,v 1.7 2011/11/14 11:28:11 flameeyes Exp $ + + 14 Nov 2011; Diego E. Pettenò gfan-0.4-r1.ebuild, + gfan-0.5.ebuild: + QA: cxx conditional was broken, fix it. 13 Nov 2011; Mike Frysinger gfan-0.4-r1.ebuild, gfan-0.5.ebuild: diff --git a/sci-mathematics/gfan/gfan-0.4-r1.ebuild b/sci-mathematics/gfan/gfan-0.4-r1.ebuild index dfb7bd2cc88b..2deb400821f5 100644 --- a/sci-mathematics/gfan/gfan-0.4-r1.ebuild +++ b/sci-mathematics/gfan/gfan-0.4-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gfan/gfan-0.4-r1.ebuild,v 1.5 2011/11/13 19:41:07 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gfan/gfan-0.4-r1.ebuild,v 1.6 2011/11/14 11:28:11 flameeyes Exp $ EAPI="3" @@ -15,7 +15,7 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="" -DEPEND="|| ( dev-libs/gmp[cxx] dev-libs/gmp[-nocxx] ) +DEPEND="dev-libs/gmp[cxx] sci-libs/cddlib" RDEPEND="${DEPEND}" diff --git a/sci-mathematics/gfan/gfan-0.5.ebuild b/sci-mathematics/gfan/gfan-0.5.ebuild index 6ec9ce26ab2a..f9503ab6f526 100644 --- a/sci-mathematics/gfan/gfan-0.5.ebuild +++ b/sci-mathematics/gfan/gfan-0.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gfan/gfan-0.5.ebuild,v 1.3 2011/11/13 19:41:07 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gfan/gfan-0.5.ebuild,v 1.4 2011/11/14 11:28:11 flameeyes Exp $ EAPI="3" @@ -15,7 +15,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -DEPEND="|| ( dev-libs/gmp[cxx] dev-libs/gmp[-nocxx] ) +DEPEND="dev-libs/gmp[cxx] sci-libs/cddlib" RDEPEND="${DEPEND}" diff --git a/sci-mathematics/normaliz/ChangeLog b/sci-mathematics/normaliz/ChangeLog index 2b9edb095a4f..0cc9988770f7 100644 --- a/sci-mathematics/normaliz/ChangeLog +++ b/sci-mathematics/normaliz/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-mathematics/normaliz # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/normaliz/ChangeLog,v 1.7 2011/11/13 19:42:46 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/normaliz/ChangeLog,v 1.8 2011/11/14 11:28:36 flameeyes Exp $ + + 14 Nov 2011; Diego E. Pettenò normaliz-2.5-r1.ebuild, + normaliz-2.7.ebuild: + QA: cxx conditional was broken, fix it. 13 Nov 2011; Mike Frysinger normaliz-2.5-r1.ebuild, normaliz-2.7.ebuild: diff --git a/sci-mathematics/normaliz/normaliz-2.5-r1.ebuild b/sci-mathematics/normaliz/normaliz-2.5-r1.ebuild index 7e8c17621085..3f882ec6aac8 100644 --- a/sci-mathematics/normaliz/normaliz-2.5-r1.ebuild +++ b/sci-mathematics/normaliz/normaliz-2.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 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.6 2011/11/13 19:42:46 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/normaliz/normaliz-2.5-r1.ebuild,v 1.7 2011/11/14 11:28:36 flameeyes Exp $ EAPI=2 @@ -17,7 +17,7 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="extras openmp" -RDEPEND="|| ( dev-libs/gmp[cxx] dev-libs/gmp[-nocxx] )" +RDEPEND="dev-libs/gmp[cxx]" DEPEND="${RDEPEND} app-arch/unzip" diff --git a/sci-mathematics/normaliz/normaliz-2.7.ebuild b/sci-mathematics/normaliz/normaliz-2.7.ebuild index b1869153d5c9..83ff89489842 100644 --- a/sci-mathematics/normaliz/normaliz-2.7.ebuild +++ b/sci-mathematics/normaliz/normaliz-2.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/normaliz/normaliz-2.7.ebuild,v 1.3 2011/11/13 19:42:46 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/normaliz/normaliz-2.7.ebuild,v 1.4 2011/11/14 11:28:36 flameeyes Exp $ EAPI=4 @@ -17,7 +17,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="extras openmp" -RDEPEND="|| ( dev-libs/gmp[cxx] dev-libs/gmp[-nocxx] )" +RDEPEND="dev-libs/gmp[cxx]" DEPEND="${RDEPEND} app-arch/unzip dev-libs/boost" -- 2.26.2