sci-libs/trilinos: Drop old, fix handling of qt support

Package-Manager: portage-2.2.0_alpha179

4 files changed, 11 insertions, 130 deletions

diff --git a/sci-libs/trilinos/ChangeLog b/sci-libs/trilinos/ChangeLog
index 6c5b81bd9..c05bfebf0 100644
--- a/sci-libs/trilinos/ChangeLog
+++ b/sci-libs/trilinos/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  12 Jun 2013; Justin Lecher <jlec@gentoo.org> -trilinos-10.10.1.ebuild,
+  trilinos-11.0.3.ebuild:
+  Drop old, fix handling of qt support
+
   03 Apr 2013; Matthias Maier <tamiko@kyomu.43-1.org> trilinos-11.0.3.ebuild:
   Version bump; correct install paths; fix prefix support
 
diff --git a/sci-libs/trilinos/Manifest b/sci-libs/trilinos/Manifest
index 32cc5b781..a800ee5f4 100644
--- a/sci-libs/trilinos/Manifest
+++ b/sci-libs/trilinos/Manifest
@@ -1,2 +1 @@
-DIST trilinos-10.10.1-Source.tar.gz 94581166 SHA256 f28cd9ce32dc0e1dde6f0f2ff144ca86ba220799376bb3b5606dde749a6b4d30 SHA512 8d35b8c7e3ab3caa772d594ff1d012f75a0de4e70d7439e76c8db3ea94736fbdf3af508f1764c5d63df9414e651b9fd6659fcce130b7b6d9a9d22f77442627e6 WHIRLPOOL 804db8a0f44084b540f2ee0197e8ab15aaf2061a1c036123c9706910b536f647805068bbaa940ff921b11061b369ad031cdd6afe5417828cc461997a75385880
 DIST trilinos-11.0.3-Source.tar.gz 107076534 SHA256 4e9d68d23eac1076200a3224fab14cd3a63a77574f1456d1bff931b2887b5c63 SHA512 9c449c6f9b2bc6346867bc68c29f83edc81790889d483129a98d149e1ff79d32b13310e8fcb3b4412b2f722b5d7efedd2a65f2e882b38629d4a1d50ecfc9783f WHIRLPOOL 7af72bd92cb4aa72ec8d98065570c9af2cc04187b7b2cce5d701e25d2c25efdc8826a4359b035008b8cf086026b88126bcfa6e807cac4f18d5fb745a48568f10
diff --git a/sci-libs/trilinos/trilinos-10.10.1.ebuild b/sci-libs/trilinos/trilinos-10.10.1.ebuild
deleted file mode 100644
index e9e930002..000000000
--- a/sci-libs/trilinos/trilinos-10.10.1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Scientific library collection for large scale problems"
-HOMEPAGE="http://trilinos.sandia.gov/"
-SRC_URI="${P}-Source.tar.gz"
-SRC_PAGE="10.10"
-
-SLOT="0"
-LICENSE="BSD LGPL-2.1"
-IUSE="arprec boost cuda hdf5 hwloc netcdf qd qt4 scotch taucs tbb umfpack zlib"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	virtual/blas
-	virtual/lapack
-	virtual/mpi
-	>=sci-libs/scalapack-2
-	arprec? ( sci-libs/arprec )
-	boost? ( dev-libs/boost )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-3.2 )
-	hdf5? ( sci-libs/hdf5[mpi] )
-	hwloc? ( sys-apps/hwloc )
-	netcdf? ( sci-libs/netcdf )
-	qd? ( sci-libs/qd )
-	qt4? ( >=dev-qt/qtgui-4.5 )
-	scotch? ( sys-libs/scotch[mpi] )
-	taucs? ( sci-libs/taucs )
-	tbb? ( dev-cpp/tbb )
-	umfpack? ( sci-libs/umfpack )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${P}-Source"
-
-RESTRICT="fetch"
-
-pkg_nofetch() {
-	einfo "Sandia requires that you register to the site in order to download Trilinos."
-	einfo "Please download ${SRC_URI} from:"
-	einfo "http://trilinos.sandia.gov/download/trilinos-${SRC_PAGE}.html"
-	einfo "and move it to ${DISTDIR}"
-}
-
-function trilinos_alternatives {
-	alt_dirs=""
-	for d in $(pkg-config --libs-only-L $1); do
-		alt_dirs="${alt_dirs};${d:2}"
-	done
-	arg="-D${2}_LIBRARY_DIRS=${alt_dirs:1}"
-	mycmakeargs+=(
-		$arg
-	)
-
-	alt_libs=""
-	for d in $(pkg-config --libs-only-l $1); do
-		alt_libs="${alt_libs};${d:2}"
-	done
-	arg="-D${2}_LIBRARY_NAMES=${alt_libs:1}"
-	mycmakeargs+=(
-		$arg
-	)
-}
-
-src_configure() {
-	CMAKE_BUILD_TYPE="release"
-	mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DTrilinos_ENABLE_ALL_PACKAGES=ON
-
-		# Directories (workaround for generating correct Makefiles and CMakefiles)
-		-DCMAKE_INSTALL_PREFIX="/"
-		-DTrilinos_INSTALL_INCLUDE_DIR="/usr/include/trilinos"
-		-DTrilinos_INSTALL_LIB_DIR="/usr/$(get_libdir)/trilinos"
-
-		# Tests
-		$(cmake-utils_use test Trilinos_ENABLE_TESTS)
-
-		# Mandatory dependencies
-		-DTPL_ENABLE_BinUtils=ON
-		-DTPL_ENABLE_MPI=ON
-		-DTPL_ENABLE_BLAS=ON
-		-DTPL_ENABLE_LAPACK=ON
-		-DTPL_ENABLE_BLACS=ON
-		-DTPL_ENABLE_SCALAPACK=ON
-		-DTrilinos_EXTRA_LINK_FLAGS="-lmpi -lmpi_cxx"
-
-		# Optional dependencies
-		$(cmake-utils_use arprec TPL_ENABLE_ARPREC)
-		$(cmake-utils_use boost TPL_ENABLE_Boost)
-		$(cmake-utils_use boost TPL_ENABLE_BoostLib)
-		$(cmake-utils_use cuda TPL_ENABLE_CUDA)
-		$(cmake-utils_use hdf5 TPL_ENABLE_HDF5)
-		$(cmake-utils_use hwloc TPL_ENABLE_HWLOC)
-		$(cmake-utils_use netcdf TPL_ENABLE_Netcdf)
-		$(cmake-utils_use qd TPL_ENABLE_QD)
-		$(cmake-utils_use qt TPL_ENABLE_QT)
-		$(cmake-utils_use scotch TPL_ENABLE_Scotch)
-		$(cmake-utils_use taucs TPL_ENABLE_TAUCS)
-		$(cmake-utils_use tbb TPL_ENABLE_TBB)
-		$(cmake-utils_use umfpack TPL_ENABLE_UMFPACK)
-		$(cmake-utils_use zlib TPL_ENABLE_Zlib)
-	)
-
-	# Scotch libraries
-	if use scotch; then
-		mycmakeargs+=( -DScotch_INCLUDE_DIRS="/usr/include/scotch" )
-	fi
-
-	# Add BLAS libraries
-	trilinos_alternatives blas BLAS
-	trilinos_alternatives lapack LAPACK
-	trilinos_alternatives scalapack SCALAPACK
-	trilinos_alternatives scalapack BLACS
-
-	mycmakeargs+=( -DBLACS_INCLUDE_DIRS="/usr/include/blacs" )
-
-	cmake-utils_src_configure
-}
diff --git a/sci-libs/trilinos/trilinos-11.0.3.ebuild b/sci-libs/trilinos/trilinos-11.0.3.ebuild
index 209b1487d..7ef814c41 100644
--- a/sci-libs/trilinos/trilinos-11.0.3.ebuild
+++ b/sci-libs/trilinos/trilinos-11.0.3.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="5"
+
 inherit cmake-utils
 
 DESCRIPTION="Scientific library collection for large scale problems"
@@ -13,11 +14,12 @@ SRC_PAGE="11.0"
 SLOT="0"
 LICENSE="BSD LGPL-2.1"
 KEYWORDS="~amd64 ~x86"
-IUSE="arprec boost cuda hdf5 hwloc netcdf qd qt scotch taucs tbb test umfpack zlib"
+IUSE="arprec boost cuda hdf5 hwloc netcdf qd qt4 scotch taucs tbb test umfpack zlib"
 
 RESTRICT="fetch"
 
-RDEPEND="virtual/blas
+RDEPEND="
+	virtual/blas
 	virtual/lapack
 	virtual/mpi
 	>=sci-libs/scalapack-2
@@ -28,7 +30,7 @@ RDEPEND="virtual/blas
 	hwloc? ( sys-apps/hwloc )
 	netcdf? ( sci-libs/netcdf )
 	qd? ( sci-libs/qd )
-	qt? ( >=x11-libs/qt-gui-4.5 )
+	qt4? ( dev-qt/qtgui:4 )
 	scotch? ( sci-libs/scotch[mpi] )
 	taucs? ( sci-libs/taucs )
 	tbb? ( dev-cpp/tbb )
@@ -102,7 +104,7 @@ src_configure() {
 		$(cmake-utils_use hwloc TPL_ENABLE_HWLOC)
 		$(cmake-utils_use netcdf TPL_ENABLE_Netcdf)
 		$(cmake-utils_use qd TPL_ENABLE_QD)
-		$(cmake-utils_use qt TPL_ENABLE_QT)
+		$(cmake-utils_use qt4 TPL_ENABLE_QT)
 		$(cmake-utils_use scotch TPL_ENABLE_Scotch)
 		$(cmake-utils_use taucs TPL_ENABLE_TAUCS)
 		$(cmake-utils_use tbb TPL_ENABLE_TBB)