Version bump

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

8 files changed, 16 insertions, 300 deletions

diff --git a/dev-libs/starpu/ChangeLog b/dev-libs/starpu/ChangeLog
index a9ac1bbf987a..0040cf8246f3 100644
--- a/dev-libs/starpu/ChangeLog
+++ b/dev-libs/starpu/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-libs/starpu
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/starpu/ChangeLog,v 1.10 2014/04/14 22:08:13 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/starpu/ChangeLog,v 1.11 2014/06/20 18:33:04 bicatali Exp $
+
+*starpu-1.1.2 (20 Jun 2014)
+
+  20 Jun 2014; Sébastien Fabbro <bicatali@gentoo.org> +starpu-1.1.2.ebuild,
+  -files/starpu-1.0.1-detect-qt.patch, -files/starpu-1.0.1-no-examples.patch,
+  -files/starpu-1.0.1-no-pc-ldflags.patch,
+  -files/starpu-1.0.1-respect-cflags.patch,
+  -files/starpu-1.0.1-system-blas.patch, -starpu-1.0.5.ebuild,
+  -starpu-1.1.0.ebuild:
+  Version bump
 
 *starpu-1.1.1 (14 Apr 2014)
 
diff --git a/dev-libs/starpu/files/starpu-1.0.1-detect-qt.patch b/dev-libs/starpu/files/starpu-1.0.1-detect-qt.patch
deleted file mode 100644
index ee89846851a4..000000000000
--- a/dev-libs/starpu/files/starpu-1.0.1-detect-qt.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Allow detection of qt, and disable when qt is present but user does not want it
-
-bicatali@gentoo.org
---- configure.ac.orig	2012-05-31 19:31:03.000000000 +0100
-+++ configure.ac	2012-05-31 19:50:42.000000000 +0100
-@@ -1085,13 +1085,13 @@
- AC_ARG_ENABLE([starpu-top],
-   [AS_HELP_STRING([--disable-starpu-top],
-     [build StarPU-Top])],
--  [enable_starpu_top="no"],
-+  [enable_starpu_top="$enableval"],
-   [enable_starpu_top="maybe"])
- 
- # Check whether StarPU-Top can be built
- AC_MSG_CHECKING(for StarPU-Top)
- 
--if test "x$enable_starpu_top" = "xmaybe" ; then
-+if test "x$enable_starpu_top" != "xno" ; then
- 	can_build_starpu_top=no
- 	AC_PATH_PROGS([QMAKE], [qmake-qt4 qmake], [not-found])
- 	if test x$QMAKE != xnot-found; then
-@@ -1133,7 +1133,7 @@
- 	fi
- fi
- 
--if test "x$enable_starpu_top" = "xmaybe" ; then
-+if test "x$enable_starpu_top" != "xno" ; then
-   build_starpu_top=$can_build_starpu_top
- else
-   build_starpu_top=no
diff --git a/dev-libs/starpu/files/starpu-1.0.1-no-examples.patch b/dev-libs/starpu/files/starpu-1.0.1-no-examples.patch
deleted file mode 100644
index 8b6181d708f4..000000000000
--- a/dev-libs/starpu/files/starpu-1.0.1-no-examples.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-Do not build examples if user did not ask for it
-
-bicatali@gentoo.org
-
---- Makefile.am.orig	2012-05-29 23:16:20.000000000 +0100
-+++ Makefile.am	2012-05-30 00:57:47.000000000 +0100
-@@ -28,7 +28,9 @@
- SUBDIRS += socl
- endif
- 
-+if BUILD_EXAMPLES
- SUBDIRS += examples
-+endif
- 
- if BUILD_GCC_PLUGIN
- SUBDIRS += gcc-plugin
---- gcc-plugin/Makefile.am.orig	2012-05-29 23:16:20.000000000 +0100
-+++ gcc-plugin/Makefile.am	2012-05-30 00:59:39.000000000 +0100
-@@ -13,7 +13,10 @@
- #
- # See the GNU Lesser General Public License in COPYING.LGPL for more details.
- 
--SUBDIRS = src tests examples
-+SUBDIRS = src tests
-+if BUILD_EXAMPLES
-+SUBDIRS += examples
-+endif
- 
- EXTRA_DIST = COPYING README ChangeLog
- 
---- configure.ac.orig	2012-05-29 23:30:19.000000000 +0100
-+++ configure.ac	2012-05-30 01:17:48.000000000 +0100
-@@ -1312,6 +1312,11 @@
- #                                                                             #
- ###############################################################################
- 
-+AC_ARG_ENABLE(build-examples, [AS_HELP_STRING([--enable-build-examples],
-+			[enable building of examples])],
-+			enable_build_examples=$enableval, enable_build_examples=no)
-+# check stuff for examples (todo)
-+AM_CONDITIONAL(BUILD_EXAMPLES, [test x$enable_build_examples != xno])
- AC_ARG_ENABLE(opengl-render, [AS_HELP_STRING([--enable-opengl-render],
- 			[enable OpenGL rendering of some examples])],
- 			enable_opengl_render=$enableval, enable_opengl_render=no)
-@@ -1434,6 +1439,11 @@
-      if test x$use_system_blas = xyes; then
-         AC_DEFINE(STARPU_SYSTEM_BLAS, [1], [use refblas library])
- 	blas_lib=system
-+     elif test x"$BLAS_LIBS" != x; then
-+        AC_DEFINE(STARPU_SYSTEM_BLAS, [1], [use user defined library])
-+	STARPU_BLAS_LDFLAGS="$BLAS_LIBS"
-+	AC_SUBST(STARPU_BLAS_LDFLAGS)
-+	blas_lib=system
-      else
- 	blas_lib=none
-      fi
---- mpi/Makefile.a.origm	2012-05-29 23:16:20.000000000 +0100
-+++ mpi/Makefile.am	2012-05-30 01:20:49.000000000 +0100
-@@ -94,7 +94,7 @@
- ###################
- # Stencil example #
- ###################
--
-+if BUILD_EXAMPLES
- examplebin_PROGRAMS +=				\
- 	examples/stencil/stencil5
- 
-@@ -202,7 +202,7 @@
- 
- check_PROGRAMS +=		\
- 	examples/reduction/mpi_reduction
--
-+endif
- ########################
- # Unit testcases       #
- ########################
---- starpufft/Makefile.am.orig	2012-05-29 23:16:20.000000000 +0100
-+++ starpufft/Makefile.am	2012-05-30 01:23:40.000000000 +0100
-@@ -67,10 +67,13 @@
- endif
- 
- examplebindir = $(libdir)/starpu/examples/starpufft
--examplebin_PROGRAMS =				\
-+
-+examplebin_PROGRAMS =
-+if BUILD_EXAMPLES
-+examplebin_PROGRAMS +=				\
- 	examples/testf \
- 	examples/test
--
-+endif
- check_PROGRAMS = examples/testf
- examples_testf_LDADD = libstarpufft-@STARPU_EFFECTIVE_VERSION@.la $(top_builddir)/src/libstarpu-@STARPU_EFFECTIVE_VERSION@.la $(FFTWF_LIBS)
- 
diff --git a/dev-libs/starpu/files/starpu-1.0.1-no-pc-ldflags.patch b/dev-libs/starpu/files/starpu-1.0.1-no-pc-ldflags.patch
deleted file mode 100644
index f6cee5d7b596..000000000000
--- a/dev-libs/starpu/files/starpu-1.0.1-no-pc-ldflags.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Do not add LDFLAGS to pkg-config flags, let user use its own
-
-bicatali@gentoo.org
---- libstarpu.pc.in.orig	2012-05-29 23:16:20.000000000 +0100
-+++ libstarpu.pc.in	2012-05-30 01:09:41.000000000 +0100
-@@ -24,6 +24,6 @@
- Version: @PACKAGE_VERSION@
- Cflags: -I${includedir}/starpu/@STARPU_EFFECTIVE_VERSION@ @STARPU_CUDA_CPPFLAGS@ -DSTARPU_USE_DEPRECATED_API
- Libs: -L${libdir} -lstarpu-@STARPU_EFFECTIVE_VERSION@ @STARPU_CUDA_LDFLAGS@ @STARPU_OPENCL_LDFLAGS@
--Libs.private: @LDFLAGS@ @LIBS@
-+Libs.private: @LIBS@
- Requires: @HWLOC_REQUIRES@
- Requires.private: @GORDON_REQUIRES@
---- mpi/libstarpumpi.pc.in.orig	2012-05-29 23:16:20.000000000 +0100
-+++ mpi/libstarpumpi.pc.in	2012-05-30 01:09:53.000000000 +0100
-@@ -24,6 +24,6 @@
- Version: @PACKAGE_VERSION@
- Cflags: -I${includedir}/starpu/@STARPU_EFFECTIVE_VERSION@ -DSTARPU_USE_DEPRECATED_API
- Libs: -L${libdir} -lstarpumpi-@STARPU_EFFECTIVE_VERSION@
--Libs.private: @LDFLAGS@ @LIBS@
-+Libs.private: @LIBS@
- Requires: libstarpu
- Requires.private:
---- mpi/starpumpi-1.0.pc.in.orig	2012-05-29 23:16:20.000000000 +0100
-+++ mpi/starpumpi-1.0.pc.in	2012-05-30 01:10:11.000000000 +0100
-@@ -24,6 +24,6 @@
- Version: @PACKAGE_VERSION@
- Cflags: -I${includedir}/starpu/@STARPU_EFFECTIVE_VERSION@
- Libs: -L${libdir} -lstarpumpi-@STARPU_EFFECTIVE_VERSION@
--Libs.private: @LDFLAGS@ @LIBS@
-+Libs.private: @LIBS@
- Requires: starpu-1.0
- Requires.private:
---- starpufft/starpufft-1.0.pc.in.orig	2012-05-29 23:16:20.000000000 +0100
-+++ starpufft/starpufft-1.0.pc.in	2012-05-30 01:10:25.000000000 +0100
-@@ -24,4 +24,4 @@
- Version: @PACKAGE_VERSION@
- Cflags: -I${includedir}/starpu/@STARPU_EFFECTIVE_VERSION@ @STARPU_CUDA_CPPFLAGS@
- Libs: -L${libdir} -lstarpufft-@STARPU_EFFECTIVE_VERSION@ 
--Libs.private: @LDFLAGS@ @LIBS@ @STARPU_CUFFT_LDFLAGS@ @FFTW_LIBS@ @FFTWF_LIBS@
-+Libs.private: @LIBS@ @STARPU_CUFFT_LDFLAGS@ @FFTW_LIBS@ @FFTWF_LIBS@
---- starpufft/libstarpufft.pc.in.orig	2012-05-29 23:16:20.000000000 +0100
-+++ starpufft/libstarpufft.pc.in	2012-05-30 01:10:43.000000000 +0100
-@@ -24,4 +24,4 @@
- Version: @PACKAGE_VERSION@
- Cflags: -I${includedir}/starpu/@STARPU_EFFECTIVE_VERSION@ @STARPU_CUDA_CPPFLAGS@ -DSTARPU_USE_DEPRECATED_API
- Libs: -L${libdir} -lstarpufft-@STARPU_EFFECTIVE_VERSION@ 
--Libs.private: @LDFLAGS@ @LIBS@ @STARPU_CUFFT_LDFLAGS@ @FFTW_LIBS@ @FFTWF_LIBS@
-+Libs.private: @LIBS@ @STARPU_CUFFT_LDFLAGS@ @FFTW_LIBS@ @FFTWF_LIBS@
---- starpu-1.0.pc.in.orig	2012-05-29 23:16:20.000000000 +0100
-+++ starpu-1.0.pc.in	2012-05-30 01:11:06.000000000 +0100
-@@ -30,6 +30,6 @@
- Version: @PACKAGE_VERSION@
- Cflags: -I${includedir}/starpu/@STARPU_EFFECTIVE_VERSION@ @STARPU_CUDA_CPPFLAGS@
- Libs: -L${libdir} -lstarpu-@STARPU_EFFECTIVE_VERSION@ @STARPU_CUDA_LDFLAGS@ @STARPU_OPENCL_LDFLAGS@
--Libs.private: @LDFLAGS@ @LIBS@
-+Libs.private: @LIBS@
- Requires: @HWLOC_REQUIRES@
- Requires.private: @GORDON_REQUIRES@
---- socl/socl-1.0.pc.in.orig	2012-05-29 23:16:20.000000000 +0100
-+++ socl/socl-1.0.pc.in	2012-05-30 01:11:19.000000000 +0100
-@@ -24,6 +24,6 @@
- Version: @PACKAGE_VERSION@
- Cflags: -I${includedir}/starpu/@STARPU_EFFECTIVE_VERSION@/socl
- Libs: -L${libdir} -lsocl-@STARPU_EFFECTIVE_VERSION@
--Libs.private: @LDFLAGS@ @LIBS@
-+Libs.private: @LIBS@
- Requires: starpu-1.0
- Requires.private:
diff --git a/dev-libs/starpu/files/starpu-1.0.1-respect-cflags.patch b/dev-libs/starpu/files/starpu-1.0.1-respect-cflags.patch
deleted file mode 100644
index 1a34ebd5a29f..000000000000
--- a/dev-libs/starpu/files/starpu-1.0.1-respect-cflags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Do not force optimization flags on user
-
-bicatali@gentoo.org
-
---- configure.ac.orig	2012-05-29 23:16:20.000000000 +0100
-+++ configure.ac	2012-05-29 23:20:48.000000000 +0100
-@@ -773,8 +773,6 @@
- if test x$enable_debug = xyes; then
- 	CFLAGS="$CFLAGS -O0"
- 	AC_DEFINE(STARPU_SPINLOCK_CHECK, [1], [check spinlock use])
--else
--	CFLAGS="$CFLAGS -O3"
- fi
- CFLAGS+=" -gdwarf-2 -g3 "
- 
diff --git a/dev-libs/starpu/files/starpu-1.0.1-system-blas.patch b/dev-libs/starpu/files/starpu-1.0.1-system-blas.patch
deleted file mode 100644
index f409230d0e56..000000000000
--- a/dev-libs/starpu/files/starpu-1.0.1-system-blas.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Allow user to set BLAS_LIBS for own blas libraries and mimic standard AX_BLAS
-autoconf macro behaviour.
-
-bicatali@gentoo.org
-
---- starpu-1.0.1/configure.ac.orig	2012-05-29 23:30:19.000000000 +0100
-+++ starpu-1.0.1/configure.ac	2012-05-30 00:02:22.000000000 +0100
-@@ -1434,6 +1434,11 @@
-      if test x$use_system_blas = xyes; then
-         AC_DEFINE(STARPU_SYSTEM_BLAS, [1], [use refblas library])
- 	blas_lib=system
-+     elif test x"$BLAS_LIBS" != x; then
-+        AC_DEFINE(STARPU_SYSTEM_BLAS, [1], [use user defined library])
-+	STARPU_BLAS_LDFLAGS="$BLAS_LIBS"
-+	AC_SUBST(STARPU_BLAS_LDFLAGS)
-+	blas_lib=system
-      else
- 	blas_lib=none
-      fi
diff --git a/dev-libs/starpu/starpu-1.0.5.ebuild b/dev-libs/starpu/starpu-1.0.5.ebuild
deleted file mode 100644
index 11dbe2070a87..000000000000
--- a/dev-libs/starpu/starpu-1.0.5.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/starpu/starpu-1.0.5.ebuild,v 1.2 2013/03/02 20:04:56 hwoarang Exp $
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-utils toolchain-funcs
-
-PID=32086
-
-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"
-
-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
-	sci-mathematics/glpk
-	blas? ( virtual/blas )
-	cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit )
-	fftw? ( sci-libs/fftw:3.0 )
-	mpi? ( virtual/mpi )
-	opencl? ( virtual/opencl )
-	qt4? (  >=dev-qt/qtgui-4.7:4
-			>=dev-qt/qtopengl-4.7:4
-			>=dev-qt/qtsql-4.7:4
-			x11-libs/qwt )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	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_configure() {
-	use blas && export BLAS_LIBS="$($(tc-getPKG_CONFIG) --libs blas)"
-	local myeconfargs=(
-		$(use_enable cuda)
-		$(use_enable debug)
-		$(use_enable examples build-examples)
-		$(use_enable fftw starpufft)
-		$(use_enable gcc-plugin gcc-extensions)
-		$(use_enable opencl)
-		$(use_enable qt4 starpu-top)
-		$(use_with mpi mpicc "$(type -P mpicc)")
-		$(use mpi && use_enable test mpi-check)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	use doc && dodoc doc/*.pdf
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/*
-	fi
-}
diff --git a/dev-libs/starpu/starpu-1.1.0.ebuild b/dev-libs/starpu/starpu-1.1.2.ebuild
index e3acab80f35b..2b788d8c4305 100644
--- a/dev-libs/starpu/starpu-1.1.0.ebuild
+++ b/dev-libs/starpu/starpu-1.1.2.ebuild
@@ -1,6 +1,6 @@
 # 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.1.0.ebuild,v 1.1 2014/01/07 23:03:34 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/starpu/starpu-1.1.2.ebuild,v 1.1 2014/06/20 18:33:04 bicatali Exp $
 
 EAPI=5
 
@@ -19,13 +19,13 @@ IUSE="blas cuda debug doc examples fftw gcc-plugin mpi opencl opengl qt4
 	static-libs test"
 
 RDEPEND="
-	sys-apps/hwloc
-	sci-mathematics/glpk
+	sys-apps/hwloc:0=
+	sci-mathematics/glpk:0=
 	blas? ( virtual/blas )
 	cuda? ( dev-util/nvidia-cuda-toolkit
 			x11-drivers/nvidia-drivers
 			blas? ( sci-libs/magma ) )
-	fftw? ( sci-libs/fftw:3.0 )
+	fftw? ( sci-libs/fftw:3.0= )
 	mpi? ( virtual/mpi )
 	opencl? ( virtual/opencl )
 	opengl? ( virtual/opengl )
@@ -51,6 +51,7 @@ src_configure() {
 	use blas && export BLAS_LIBS="$($(tc-getPKG_CONFIG) --libs blas)"
 
 	local myeconfargs=(
+		--disable-build-examples
 		$(use_enable cuda)
 		$(use_enable debug)
 		$(use_enable doc build-doc)