sci-mathematics/cgal: Drop old; punt base.eclass

(Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

6 files changed, 18 insertions, 229 deletions

diff --git a/sci-mathematics/cgal/ChangeLog b/sci-mathematics/cgal/ChangeLog
index 65a957557218..c07941b5b20f 100644
--- a/sci-mathematics/cgal/ChangeLog
+++ b/sci-mathematics/cgal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/cgal
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/ChangeLog,v 1.24 2013/11/12 16:40:50 bicatali Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/ChangeLog,v 1.25 2014/01/06 14:11:39 jlec Exp $
+
+  06 Jan 2014; Justin Lecher <jlec@gentoo.org> -cgal-4.0.2.ebuild,
+  -cgal-4.1.ebuild, -cgal-4.2.ebuild, cgal-4.3.ebuild, metadata.xml:
+  Drop old; punt base.eclass
 
   12 Nov 2013; Sébastien Fabbro <bicatali@gentoo.org> cgal-4.3.ebuild:
   Fixed doc installation directory (bug #490702)
diff --git a/sci-mathematics/cgal/cgal-4.0.2.ebuild b/sci-mathematics/cgal/cgal-4.0.2.ebuild
deleted file mode 100644
index 8a01e51cb217..000000000000
--- a/sci-mathematics/cgal/cgal-4.0.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2013 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.4 2013/03/02 23:24:32 hwoarang Exp $
-
-EAPI=4
-
-CMAKE_BUILD_TYPE=Release
-
-inherit base multilib cmake-utils
-
-MY_P=CGAL-${PV}
-PID=31176
-DPID=31181
-
-DESCRIPTION="C++ library for geometric algorithms and data structures"
-HOMEPAGE="http://www.cgal.org/ https://gforge.inria.fr/projects/cgal/"
-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 ~amd64-linux ~x86-linux"
-IUSE="doc examples +gmp mpfi qt4"
-
-RDEPEND="
-	dev-libs/boost
-	dev-libs/mpfr
-	sys-libs/zlib
-	x11-libs/libX11
-	virtual/glu
-	virtual/opengl
-	gmp? ( dev-libs/gmp[cxx] )
-	qt4? (
-		dev-qt/qtgui:4
-		dev-qt/qtopengl:4 )
-	mpfi? ( sci-libs/mpfi )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="AUTHORS CHANGES* README"
-
-src_prepare() {
-	base_src_prepare
-	sed \
-		-e '/install(FILES AUTHORS/d' \
-		-i CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs+=(
-		-DCGAL_INSTALL_LIB_DIR=$(get_libdir)
-		-DWITH_CGAL_Qt3=OFF
-		-DWITH_LEDA=OFF
-		$(cmake-utils_use_with gmp)
-		$(cmake-utils_use_with gmp GMPXX)
-		$(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/cgal-4.1.ebuild b/sci-mathematics/cgal/cgal-4.1.ebuild
deleted file mode 100644
index 9a339a06035b..000000000000
--- a/sci-mathematics/cgal/cgal-4.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/cgal-4.1.ebuild,v 1.2 2013/03/02 23:24:32 hwoarang Exp $
-
-EAPI=4
-
-CMAKE_BUILD_TYPE=Release
-
-inherit base multilib cmake-utils
-
-MY_P=CGAL-${PV}
-PID=31639
-DPID=31647
-
-DESCRIPTION="C++ library for geometric algorithms and data structures"
-HOMEPAGE="http://www.cgal.org/ https://gforge.inria.fr/projects/cgal/"
-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 ~amd64-linux ~x86-linux"
-IUSE="doc examples +gmp mpfi qt4"
-
-RDEPEND="
-	dev-libs/boost
-	dev-libs/mpfr
-	sys-libs/zlib
-	x11-libs/libX11
-	virtual/glu
-	virtual/opengl
-	gmp? ( dev-libs/gmp[cxx] )
-	qt4? (
-		dev-qt/qtgui:4
-		dev-qt/qtopengl:4 )
-	mpfi? ( sci-libs/mpfi )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="AUTHORS CHANGES* README"
-
-src_prepare() {
-	base_src_prepare
-	sed \
-		-e '/install(FILES AUTHORS/d' \
-		-i CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs+=(
-		-DCGAL_INSTALL_LIB_DIR=$(get_libdir)
-		-DWITH_CGAL_Qt3=OFF
-		-DWITH_LEDA=OFF
-		$(cmake-utils_use_with gmp)
-		$(cmake-utils_use_with gmp GMPXX)
-		$(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/cgal-4.2.ebuild b/sci-mathematics/cgal/cgal-4.2.ebuild
deleted file mode 100644
index 8f51baf73e79..000000000000
--- a/sci-mathematics/cgal/cgal-4.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/cgal-4.2.ebuild,v 1.1 2013/07/09 15:47:06 bicatali Exp $
-
-EAPI=5
-
-CMAKE_BUILD_TYPE=Release
-
-inherit base multilib cmake-utils
-
-MY_P=CGAL-${PV}
-PID=32361
-DPID=32365
-
-DESCRIPTION="C++ library for geometric algorithms and data structures"
-HOMEPAGE="http://www.cgal.org/ https://gforge.inria.fr/projects/cgal/"
-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 ~amd64-linux ~x86-linux"
-IUSE="doc examples +gmp mpfi qt4"
-
-RDEPEND="
-	dev-libs/boost
-	dev-libs/mpfr
-	sys-libs/zlib
-	x11-libs/libX11
-	virtual/glu
-	virtual/opengl
-	gmp? ( dev-libs/gmp[cxx] )
-	qt4? (
-		dev-qt/qtgui:4
-		dev-qt/qtopengl:4 )
-	mpfi? ( sci-libs/mpfi )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="AUTHORS CHANGES* README"
-
-src_prepare() {
-	base_src_prepare
-	sed \
-		-e '/install(FILES AUTHORS/d' \
-		-i CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs+=(
-		-DCGAL_INSTALL_LIB_DIR=$(get_libdir)
-		-DWITH_CGAL_Qt3=OFF
-		-DWITH_LEDA=OFF
-		$(cmake-utils_use_with gmp)
-		$(cmake-utils_use_with gmp GMPXX)
-		$(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/cgal-4.3.ebuild b/sci-mathematics/cgal/cgal-4.3.ebuild
index 57c97322e170..d3b7e4f0e201 100644
--- a/sci-mathematics/cgal/cgal-4.3.ebuild
+++ b/sci-mathematics/cgal/cgal-4.3.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/cgal-4.3.ebuild,v 1.2 2013/11/12 16:40:50 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cgal/cgal-4.3.ebuild,v 1.3 2014/01/06 14:11:39 jlec Exp $
 
 EAPI=5
 
 CMAKE_BUILD_TYPE=Release
 
-inherit base multilib cmake-utils
+inherit multilib cmake-utils
 
 MY_P=CGAL-${PV}
 PID=32995
@@ -33,7 +33,8 @@ RDEPEND="
 	gmp? ( dev-libs/gmp[cxx] )
 	qt4? (
 		dev-qt/qtgui:4
-		dev-qt/qtopengl:4 )
+		dev-qt/qtopengl:4
+	)
 	mpfi? ( sci-libs/mpfi )"
 DEPEND="${RDEPEND}
 	app-arch/xz-utils
@@ -44,7 +45,7 @@ S="${WORKDIR}/${MY_P}"
 DOCS="AUTHORS CHANGES* README"
 
 src_prepare() {
-	base_src_prepare
+	cmake-utils_src_prepare
 	sed \
 		-e '/install(FILES AUTHORS/d' \
 		-i CMakeLists.txt || die
@@ -64,8 +65,8 @@ src_configure() {
 }
 
 src_install() {
+	use doc && HTML_DOCS=( "${WORKDIR}"/doc_html/. )
 	cmake-utils_src_install
-	use doc && dohtml -r "${WORKDIR}"/doc_html/*
 	if use examples; then
 		insinto /usr/share/doc/${PF}
 		doins -r examples demo
diff --git a/sci-mathematics/cgal/metadata.xml b/sci-mathematics/cgal/metadata.xml
index 40a256015c0b..aa54a0b5987d 100644
--- a/sci-mathematics/cgal/metadata.xml
+++ b/sci-mathematics/cgal/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-mathematics</herd>
-<longdescription lang="en">
+  <herd>sci-mathematics</herd>
+  <longdescription lang="en">
   The Computational Geometry Algorithms Library is a collaborative
   open source library containing:
   * the Kernel with geometric primitives such as points, vectors,
@@ -15,7 +15,7 @@
   * the Support Library which offers interfaces to other packages,
     e.g., for visualisation, and I/O, and other support facilities.
 </longdescription>
-<use>
-  <flag name="mpfi">Enable support for multiple recision interval arithmetic via <pkg>sci-mathematics/mpfi</pkg></flag>
-</use>
+  <use>
+    <flag name="mpfi">Enable support for multiple recision interval arithmetic via <pkg>sci-mathematics/mpfi</pkg></flag>
+  </use>
 </pkgmetadata>