keyword amd64-linux x86-linux

(Portage version: 2.2.01.20796-prefix/cvs/Linux x86_64)

5 files changed, 7 insertions, 162 deletions

diff --git a/sci-mathematics/cgal/ChangeLog b/sci-mathematics/cgal/ChangeLog
index baca9df38b9b..9a0cd9857176 100644
--- a/sci-mathematics/cgal/ChangeLog
+++ b/sci-mathematics/cgal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/cgal
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/ChangeLog,v 1.17 2012/07/07 12:44:10 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/ChangeLog,v 1.18 2012/08/09 18:06:20 bicatali Exp $
+
+  09 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org> -cgal-3.9.ebuild,
+  -cgal-4.0.ebuild, -files/cgal-4.0-gcc47.patch, cgal-4.0.2.ebuild:
+  keyword amd64-linux x86-linux
 
 *cgal-4.0.2 (07 Jul 2012)
 
diff --git a/sci-mathematics/cgal/cgal-3.9.ebuild b/sci-mathematics/cgal/cgal-3.9.ebuild
deleted file mode 100644
index 47dde121ae35..000000000000
--- a/sci-mathematics/cgal/cgal-3.9.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/cgal-3.9.ebuild,v 1.3 2012/05/04 07:46:50 jdhore Exp $
-
-EAPI=4
-CMAKE_BUILD_TYPE=Release
-inherit base multilib cmake-utils
-
-MY_P=CGAL-${PV}
-PID=29122
-DPID=29120
-
-DESCRIPTION="C++ library for geometric algorithms and data structures"
-HOMEPAGE="http://www.cgal.org/"
-SRC_URI="http://gforge.inria.fr/frs/download.php/${PID}/${MY_P}.tar.xz
-	doc? ( http://gforge.inria.fr/frs/download.php/${DPID}/${MY_P}-doc_html.tar.xz )"
-
-LICENSE="LGPL-2.1 MIT QPL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cxx doc examples +gmp lapack mpfi qt4"
-
-RDEPEND="dev-libs/boost
-	dev-libs/mpfr
-	sys-libs/zlib
-	x11-libs/libX11
-	virtual/opengl
-	gmp? ( dev-libs/gmp[cxx=] )
-	lapack? ( virtual/lapack )
-	qt4? ( x11-libs/qt-gui:4
-		x11-libs/qt-opengl:4 )
-	mpfi? ( sci-libs/mpfi )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="AUTHORS CHANGES* README"
-
-src_prepare() {
-	base_src_prepare
-	sed -i \
-		-e '/install(FILES AUTHORS/d' \
-		CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs
-	if use gmp; then
-		mycmakeargs+=( $(cmake-utils_use_with cxx GMPXX) )
-	else
-		mycmakeargs+=( "-DWITH_GMPXX=OFF" )
-	fi
-	mycmakeargs+=(
-		"-DCGAL_INSTALL_LIB_DIR=$(get_libdir)"
-		"-DWITH_CGAL_Qt3=OFF"
-		"-DWITH_LEDA=OFF"
-		$(cmake-utils_use_with examples)
-		$(cmake-utils_use_with examples DEMOS)
-		$(cmake-utils_use_with gmp)
-		$(cmake-utils_use_with lapack CPACK)
-		$(cmake-utils_use_with qt4 CGAL_Qt4)
-		$(cmake-utils_use_with mpfi)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	use doc && dohtml -r "${WORKDIR}"/doc_html/cgal_manual/*
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/sci-mathematics/cgal/cgal-4.0.2.ebuild b/sci-mathematics/cgal/cgal-4.0.2.ebuild
index 846be0a8e0d8..ecc76bfd5110 100644
--- a/sci-mathematics/cgal/cgal-4.0.2.ebuild
+++ b/sci-mathematics/cgal/cgal-4.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/cgal-4.0.2.ebuild,v 1.1 2012/07/07 12:44:10 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/cgal-4.0.2.ebuild,v 1.2 2012/08/09 18:06:20 bicatali Exp $
 
 EAPI=4
 CMAKE_BUILD_TYPE=Release
@@ -17,7 +17,7 @@ SRC_URI="http://gforge.inria.fr/frs/download.php/${PID}/${MY_P}.tar.xz
 
 LICENSE="LGPL-3 GPL-3 Boost-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples +gmp mpfi qt4"
 
 RDEPEND="dev-libs/boost
diff --git a/sci-mathematics/cgal/cgal-4.0.ebuild b/sci-mathematics/cgal/cgal-4.0.ebuild
deleted file mode 100644
index 73642255fb05..000000000000
--- a/sci-mathematics/cgal/cgal-4.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/cgal-4.0.ebuild,v 1.4 2012/05/10 17:48:10 bicatali Exp $
-
-EAPI=4
-CMAKE_BUILD_TYPE=Release
-inherit base multilib cmake-utils
-
-MY_P=CGAL-${PV}
-PID=30385
-DPID=30389
-
-DESCRIPTION="C++ library for geometric algorithms and data structures"
-HOMEPAGE="http://www.cgal.org/"
-SRC_URI="http://gforge.inria.fr/frs/download.php/${PID}/${MY_P}.tar.xz
-	doc? ( http://gforge.inria.fr/frs/download.php/${DPID}/${MY_P}-doc_html.tar.xz )"
-
-LICENSE="LGPL-3 GPL-3 Boost-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cxx doc examples +gmp mpfi qt4"
-
-RDEPEND="dev-libs/boost
-	dev-libs/mpfr
-	sys-libs/zlib
-	x11-libs/libX11
-	virtual/opengl
-	gmp? ( dev-libs/gmp[cxx=] )
-	qt4? ( x11-libs/qt-gui:4
-		x11-libs/qt-opengl:4 )
-	mpfi? ( sci-libs/mpfi )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="AUTHORS CHANGES* README"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc47.patch
-	base_src_prepare
-	sed -i \
-		-e '/install(FILES AUTHORS/d' \
-		CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs
-	if use gmp; then
-		mycmakeargs+=( $(cmake-utils_use_with cxx GMPXX) )
-	else
-		mycmakeargs+=( "-DWITH_GMPXX=OFF" )
-	fi
-	mycmakeargs+=(
-		"-DCGAL_INSTALL_LIB_DIR=$(get_libdir)"
-		"-DWITH_CGAL_Qt3=OFF"
-		"-DWITH_LEDA=OFF"
-		$(cmake-utils_use_with gmp)
-		$(cmake-utils_use_with qt4 CGAL_Qt4)
-		$(cmake-utils_use_with mpfi)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	use doc && dohtml -r "${WORKDIR}"/doc_html/cgal_manual/*
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples demo
-	fi
-}
diff --git a/sci-mathematics/cgal/files/cgal-4.0-gcc47.patch b/sci-mathematics/cgal/files/cgal-4.0-gcc47.patch
deleted file mode 100644
index a2ed0e488803..000000000000
--- a/sci-mathematics/cgal/files/cgal-4.0-gcc47.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/CGAL/Mesh_2/Do_not_refine_edges.h.ori	2012-04-25 23:14:26.132198961 +0200
-+++ ./include/CGAL/Mesh_2/Do_not_refine_edges.h	2012-04-25 23:14:46.304953789 +0200
-@@ -80,7 +80,7 @@
-       const Face_handle& fh = eit->first;
-       const int& i = eit->second;
- 
--      if(fh->is_constrained(i) && !is_locally_conform(this->tr, fh, i, p))
-+      if(fh->is_constrained(i) && !this->is_locally_conform(this->tr, fh, i, p))
-       {
-         return CONFLICT_AND_ELEMENT_SHOULD_BE_DROPPED;
-       }