examples are not configured, only installed (fixing bug #415349) together with demos. lapack dependency is removed, only used for examples.

(Portage version: 2.1.10.56/cvs/Linux x86_64)

3 files changed, 11 insertions, 86 deletions

diff --git a/sci-mathematics/cgal/ChangeLog b/sci-mathematics/cgal/ChangeLog
index 692d752bb0e5..4cb1d8b5beb3 100644
--- a/sci-mathematics/cgal/ChangeLog
+++ b/sci-mathematics/cgal/ChangeLog
@@ -1,6 +1,11 @@
 # 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.15 2012/05/08 18:27:58 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/ChangeLog,v 1.16 2012/05/10 17:48:10 bicatali Exp $
+
+  10 May 2012; Sébastien Fabbro <bicatali@gentoo.org> -cgal-3.7.ebuild,
+  cgal-4.0.ebuild:
+  examples are not configured, only installed (fixing bug #415349) together
+  with demos. lapack dependency is removed, only used for examples.
 
   08 May 2012; Sébastien Fabbro <bicatali@gentoo.org> cgal-4.0.ebuild,
   +files/cgal-4.0-gcc47.patch:
diff --git a/sci-mathematics/cgal/cgal-3.7.ebuild b/sci-mathematics/cgal/cgal-3.7.ebuild
deleted file mode 100644
index b80700bf0424..000000000000
--- a/sci-mathematics/cgal/cgal-3.7.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.7.ebuild,v 1.4 2012/05/04 07:46:50 jdhore Exp $
-
-EAPI=3
-CMAKE_BUILD_TYPE=Release
-inherit base multilib cmake-utils
-
-MY_P=CGAL-${PV}
-PID=27640
-DPID=27644
-
-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 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 )"
-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_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	if use doc; then
-		dohtml -r "${WORKDIR}"/doc_html/cgal_manual/*
-	fi
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples || die
-	fi
-}
diff --git a/sci-mathematics/cgal/cgal-4.0.ebuild b/sci-mathematics/cgal/cgal-4.0.ebuild
index cb1d7fd6413d..73642255fb05 100644
--- a/sci-mathematics/cgal/cgal-4.0.ebuild
+++ b/sci-mathematics/cgal/cgal-4.0.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.ebuild,v 1.3 2012/05/08 18:27:58 bicatali Exp $
+# $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
@@ -15,10 +15,10 @@ 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"
+LICENSE="LGPL-3 GPL-3 Boost-1.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+cxx doc examples +gmp lapack mpfi qt4"
+IUSE="+cxx doc examples +gmp mpfi qt4"
 
 RDEPEND="dev-libs/boost
 	dev-libs/mpfr
@@ -26,13 +26,11 @@ RDEPEND="dev-libs/boost
 	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"
+	app-arch/xz-utils"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -57,8 +55,6 @@ src_configure() {
 		"-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 qt4 CGAL_Qt4)
 		$(cmake-utils_use_with mpfi)
@@ -71,6 +67,6 @@ src_install() {
 	use doc && dohtml -r "${WORKDIR}"/doc_html/cgal_manual/*
 	if use examples; then
 		insinto /usr/share/doc/${PF}
-		doins -r examples
+		doins -r examples demo
 	fi
 }