summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2011-11-14 11:27:36 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2011-11-14 11:27:36 +0000
commit85671fd47132d2ac29eae872d8c164ba1bf5545b (patch)
tree24e20c7f565c6ce65b3cf43f30905cfe418986c4
parentQA: cxx conditional was broken, fix it. (diff)
downloadgentoo-2-85671fd47132d2ac29eae872d8c164ba1bf5545b.tar.gz
gentoo-2-85671fd47132d2ac29eae872d8c164ba1bf5545b.tar.bz2
gentoo-2-85671fd47132d2ac29eae872d8c164ba1bf5545b.zip
QA: cxx conditional was broken, fix it.
(Portage version: 2.2.0_alpha74/cvs/Linux x86_64)
-rw-r--r--sci-mathematics/cgal/ChangeLog6
-rw-r--r--sci-mathematics/cgal/cgal-3.6.1.ebuild7
-rw-r--r--sci-mathematics/cgal/cgal-3.7.ebuild7
3 files changed, 9 insertions, 11 deletions
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ò <flameeyes@gentoo.org> cgal-3.6.1.ebuild,
+ cgal-3.7.ebuild:
+ QA: cxx conditional was broken, fix it.
13 Nov 2011; Mike Frysinger <vapier@gentoo.org> 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 )"