From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id DC4F71381F3 for ; Wed, 12 Jun 2013 20:04:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A5C61E09DF; Wed, 12 Jun 2013 20:04:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7C863E09DF for ; Wed, 12 Jun 2013 20:04:23 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 48D2A33E44F for ; Wed, 12 Jun 2013 20:04:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id BC2E7E545F for ; Wed, 12 Jun 2013 20:04:20 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1371067252.59bb9b487b28a8c629187a993a06454b0b68e8dc.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/trilinos/ChangeLog sci-libs/trilinos/trilinos-10.10.1.ebuild sci-libs/trilinos/trilinos-11.0.3.ebuild X-VCS-Directories: sci-libs/trilinos/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 59bb9b487b28a8c629187a993a06454b0b68e8dc X-VCS-Branch: master Date: Wed, 12 Jun 2013 20:04:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2844d24b-5b07-4fdd-b436-94d404eca49a X-Archives-Hash: 851f3f360225f90468a05166d2a6d03a commit: 59bb9b487b28a8c629187a993a06454b0b68e8dc Author: Justin Lecher gentoo org> AuthorDate: Wed Jun 12 20:00:52 2013 +0000 Commit: Justin Lecher gentoo org> CommitDate: Wed Jun 12 20:00:52 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=59bb9b48 sci-libs/trilinos: Drop old, fix handling of qt support Package-Manager: portage-2.2.0_alpha179 --- sci-libs/trilinos/ChangeLog | 4 + sci-libs/trilinos/trilinos-10.10.1.ebuild | 124 ------------------------------ sci-libs/trilinos/trilinos-11.0.3.ebuild | 12 +-- 3 files changed, 11 insertions(+), 129 deletions(-) diff --git a/sci-libs/trilinos/ChangeLog b/sci-libs/trilinos/ChangeLog index 6c5b81b..c05bfeb 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 -trilinos-10.10.1.ebuild, + trilinos-11.0.3.ebuild: + Drop old, fix handling of qt support + 03 Apr 2013; Matthias Maier trilinos-11.0.3.ebuild: Version bump; correct install paths; fix prefix support 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 e9e9300..0000000 --- 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 209b148..7ef814c 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)