gentoo resync : 25.01.2018

3 files changed, 10 insertions, 18 deletions

diff --git a/dev-libs/starpu/Manifest b/dev-libs/starpu/Manifest
index bb83dce81b9f..e661e6f7536a 100644
--- a/dev-libs/starpu/Manifest
+++ b/dev-libs/starpu/Manifest
@@ -1,4 +1,4 @@
 DIST starpu-1.1.5.tar.gz 5209660 BLAKE2B 3caf313402a840b8196dc94b6c4f973f87a21878bcbfe1a44ce14218c02290c8701eb3829ce0b89f3029f768c7760ea94c4f307c850e6e42ec877be017c50b4a SHA512 e22a51c601c1997f6a9279e87b22a96f2b25a9c8bb4b715ee3a048ed8af638997610ba72c7b42f61d9401464464c57402feebc76368f9df6ca84fa1305baeedd
-EBUILD starpu-1.1.5-r1.ebuild 2118 BLAKE2B 7197f5bada5250292746379f45ef41bdf8c9d48caf76f91d9b4591863248256961f08276fe7808ca84a2699fc64063dd7f22bb4fedefc82ebff507d1c407fb72 SHA512 553d55a66ed6ce32aa0cd328ae5003daaf4d3603267f69aed67b442f79d4861c9f4b5f11c257e6f07be46dc85607b6f2177c1e393fa5957124e494920b963bdb
-EBUILD starpu-1.1.5.ebuild 2173 BLAKE2B 981d681eb1b75210b0e6088d88436e7d60f17e2ff52bbc51af4fbd7fc6757e349299e346888dd76f3f35a8795516fdb2745e7d2517b4e6a6dfc0324b8b2b2bb7 SHA512 d85b0e808edea0b80c88f44bcec9e34df726dff2ad2f9be89fbe1e446c8899e56ecb7ee0a68f07646a07f426fee9e1ba67f82e47052f64460ecb2e6dbf29553e
+EBUILD starpu-1.1.5-r1.ebuild 2005 BLAKE2B 1e249d69ca9b6ad097a472c6cc0e0ac0ec141bac968dbc291340c10815482a0c3ce64721c81c91f082789496d6ab247863646ed3dafbf780efaab9bcd54692dd SHA512 477d14b9a4a4269c0c61963feb8e7eced569365709128456ca75bae00c8bb30c6f3bdf1950097faf52ab4ab674d784a9a826f3bbbd8d50d622a724c0d374e325
+EBUILD starpu-1.1.5.ebuild 2060 BLAKE2B 265d77704570bc9832c2ee4274eb2e7c7a4ccfe77714ea2ae32b3947df738a971d79ca8ae8ab24bdb815f821f087dedc283042becff12b93c61e5283696e86c2 SHA512 201b79423b2f6b9ba2ae810853427a55e0758b9e8a5136f610f54fc1a4255673c3f78c8caab3099f6740739d0b83eb7c4f2e53c8400c96c66797f63669ae5df7
 MISC metadata.xml 853 BLAKE2B 5873820e19a10507aa381bdc5e80defaa2dac2e65fc923aff907c7c28795205c271b82f756c5255e64ec0147726b2a305573a49d0a7694bf583b59a3e1c5eddd SHA512 43b79ddb2dbc234bf4715ee5d7c7dbd78dd9828f1fbd930198eed2a8dea66ebc28d09c105d2d3fc0685ae8123496b360f20e11b4a199c99743373ad9774bc964
diff --git a/dev-libs/starpu/starpu-1.1.5-r1.ebuild b/dev-libs/starpu/starpu-1.1.5-r1.ebuild
index f6b978c34f00..c6fda9dd478c 100644
--- a/dev-libs/starpu/starpu-1.1.5-r1.ebuild
+++ b/dev-libs/starpu/starpu-1.1.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SLOT="0/8"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 IUSE="blas cuda debug doc examples fftw gcc-plugin mpi opencl opengl
-	qt4 static-libs test"
+	static-libs test"
 
 RDEPEND="
 	sys-apps/hwloc:0=
@@ -28,11 +28,7 @@ RDEPEND="
 	fftw? ( sci-libs/fftw:3.0= )
 	mpi? ( virtual/mpi )
 	opencl? ( virtual/opencl )
-	opengl? ( media-libs/freeglut:0= )
-	qt4? (  >=dev-qt/qtgui-4.7:4
-			>=dev-qt/qtopengl-4.7:4
-			>=dev-qt/qtsql-4.7:4
-			x11-libs/qwt:5 )"
+	opengl? ( media-libs/freeglut:0= )"
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
@@ -53,6 +49,7 @@ src_configure() {
 
 	econf \
 		--disable-build-examples \
+		--disable-starpu-top \
 		$(use_enable cuda) \
 		$(use_enable debug) \
 		$(use_enable doc build-doc) \
@@ -60,7 +57,6 @@ src_configure() {
 		$(use_enable gcc-plugin gcc-extensions) \
 		$(use_enable opencl) \
 		$(use_enable opengl opengl-render) \
-		$(use_enable qt4 starpu-top) \
 		$(use_enable static-libs static) \
 		$(use_with mpi mpicc "$(type -P mpicc)") \
 		$(use cuda && use_enable blas magma) \
diff --git a/dev-libs/starpu/starpu-1.1.5.ebuild b/dev-libs/starpu/starpu-1.1.5.ebuild
index 420f6f28d9b5..ce3ab4e90515 100644
--- a/dev-libs/starpu/starpu-1.1.5.ebuild
+++ b/dev-libs/starpu/starpu-1.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~x86 ~amd64-linux ~x86-linux"
 
-IUSE="blas cuda debug doc examples fftw gcc-plugin mpi opencl opengl qt4
+IUSE="blas cuda debug doc examples fftw gcc-plugin mpi opencl opengl
 	static-libs test"
 
 RDEPEND="
@@ -29,11 +29,7 @@ RDEPEND="
 	fftw? ( sci-libs/fftw:3.0= )
 	mpi? ( virtual/mpi )
 	opencl? ( virtual/opencl )
-	opengl? ( media-libs/freeglut:0= )
-	qt4? (  >=dev-qt/qtgui-4.7:4
-			>=dev-qt/qtopengl-4.7:4
-			>=dev-qt/qtsql-4.7:4
-			x11-libs/qwt:5 )"
+	opengl? ( media-libs/freeglut:0= )"
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
@@ -53,6 +49,7 @@ src_configure() {
 
 	local myeconfargs=(
 		--disable-build-examples
+		--disable-starpu-top
 		$(use_enable cuda)
 		$(use_enable debug)
 		$(use_enable doc build-doc)
@@ -60,7 +57,6 @@ src_configure() {
 		$(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)