Version bump. Add opengl flag, documentation is now built, tests are run with -j1 to avoid oversuscribing

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

2 files changed, 43 insertions, 18 deletions

diff --git a/dev-libs/starpu/ChangeLog b/dev-libs/starpu/ChangeLog
index 4434b8adcf46..2a2e3731ee53 100644
--- a/dev-libs/starpu/ChangeLog
+++ b/dev-libs/starpu/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/starpu
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/starpu/ChangeLog,v 1.8 2013/03/02 20:04:56 hwoarang Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/starpu/ChangeLog,v 1.9 2014/01/07 23:03:34 bicatali Exp $
+
+*starpu-1.1.0 (07 Jan 2014)
+
+  07 Jan 2014; Sébastien Fabbro <bicatali@gentoo.org> +starpu-1.1.0.ebuild,
+  -starpu-1.0.4.ebuild:
+  Version bump. Add opengl flag, documentation is now built, tests are run with
+  -j1 to avoid oversuscribing
 
   02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> starpu-1.0.4.ebuild,
   starpu-1.0.5.ebuild:
diff --git a/dev-libs/starpu/starpu-1.0.4.ebuild b/dev-libs/starpu/starpu-1.1.0.ebuild
index f701e03e8850..e3acab80f35b 100644
--- a/dev-libs/starpu/starpu-1.0.4.ebuild
+++ b/dev-libs/starpu/starpu-1.1.0.ebuild
@@ -1,30 +1,34 @@
-# 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/dev-libs/starpu/starpu-1.0.4.ebuild,v 1.2 2013/03/02 20:04:56 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/starpu/starpu-1.1.0.ebuild,v 1.1 2014/01/07 23:03:34 bicatali Exp $
 
-EAPI=4
+EAPI=5
 
 AUTOTOOLS_AUTORECONF=1
-inherit autotools-utils toolchain-funcs
-
-PID=31588
+inherit autotools-utils toolchain-funcs cuda
 
 DESCRIPTION="Unified runtime system for heterogeneous multicore architectures"
 HOMEPAGE="http://runtime.bordeaux.inria.fr/StarPU/"
-SRC_URI="https://gforge.inria.fr/frs/download.php/${PID}/${P}.tar.gz"
+SRC_URI="${HOMEPAGE}/files/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
-IUSE="blas cuda debug doc examples fftw gcc-plugin mpi opencl qt4 static-libs test"
-RDEPEND="sys-apps/hwloc
+IUSE="blas cuda debug doc examples fftw gcc-plugin mpi opencl opengl qt4
+	static-libs test"
+
+RDEPEND="
+	sys-apps/hwloc
 	sci-mathematics/glpk
 	blas? ( virtual/blas )
-	cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit )
+	cuda? ( dev-util/nvidia-cuda-toolkit
+			x11-drivers/nvidia-drivers
+			blas? ( sci-libs/magma ) )
 	fftw? ( sci-libs/fftw:3.0 )
 	mpi? ( virtual/mpi )
 	opencl? ( virtual/opencl )
+	opengl? ( virtual/opengl )
 	qt4? (  >=dev-qt/qtgui-4.7:4
 			>=dev-qt/qtopengl-4.7:4
 			>=dev-qt/qtsql-4.7:4
@@ -32,32 +36,46 @@ RDEPEND="sys-apps/hwloc
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
+	doc? ( app-doc/doxygen virtual/latex-base )
 	test? ( gcc-plugin? ( dev-scheme/guile ) )"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.1-respect-cflags.patch
-	"${FILESDIR}"/${PN}-1.0.1-system-blas.patch
-	"${FILESDIR}"/${PN}-1.0.1-no-pc-ldflags.patch
-)
+src_prepare() {
+	# upstream did not want the patches so apply sed's
+	sed -i -e 's/-O3 $CFLAGS/$CFLAGS/' configure.ac || die
+	sed -i -e '/Libs.private/s/@LDFLAGS@//g' *.pc.in */*.pc.in || die
+	autotools-utils_src_prepare
+	use cuda && cuda_src_prepare
+}
 
 src_configure() {
 	use blas && export BLAS_LIBS="$($(tc-getPKG_CONFIG) --libs blas)"
+
 	local myeconfargs=(
 		$(use_enable cuda)
 		$(use_enable debug)
+		$(use_enable doc build-doc)
 		$(use_enable fftw starpufft)
 		$(use_enable gcc-plugin gcc-extensions)
 		$(use_enable opencl)
+		$(use_enable opengl opengl-render)
 		$(use_enable qt4 starpu-top)
 		$(use_with mpi mpicc "$(type -P mpicc)")
+		$(use cuda && use_enable blas magma)
 		$(use mpi && use_enable test mpi-check)
 	)
 	autotools-utils_src_configure
 }
 
+src_test() {
+	autotools-utils_src_test -j1 showcheck
+}
+
 src_install() {
 	autotools-utils_src_install
-	use doc && dodoc doc/*.pdf
+	if use doc; then
+		dodoc "${BUILD_DIR}"/doc/doxygen/*.pdf
+		dohtml -r "${BUILD_DIR}"/doc/doxygen/html/*
+	fi
 	if use examples; then
 		insinto /usr/share/doc/${PF}/examples
 		doins -r examples/*