From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Rv551-00075h-Rd for garchives@archives.gentoo.org; Wed, 08 Feb 2012 10:48:52 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C7222E0656; Wed, 8 Feb 2012 10:48:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8172CE064B for ; Wed, 8 Feb 2012 10:48:41 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C509D1B403E for ; Wed, 8 Feb 2012 10:48:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 3A5458004F for ; Wed, 8 Feb 2012 10:48:40 +0000 (UTC) From: "Kacper Kowalik" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Kacper Kowalik" Message-ID: <55732526debdc9d3edb53298e7f159cf404f0baa.xarthisius@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/gmsh/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/gmsh/gmsh-2.5.0-r1.ebuild X-VCS-Directories: sci-libs/gmsh/ X-VCS-Committer: xarthisius X-VCS-Committer-Name: Kacper Kowalik X-VCS-Revision: 55732526debdc9d3edb53298e7f159cf404f0baa Date: Wed, 8 Feb 2012 10:48:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: ac10744a-9082-4fde-8bf0-d905851978ce X-Archives-Hash: c9679258797ea93165f8ad5ad6ca5a50 commit: 55732526debdc9d3edb53298e7f159cf404f0baa Author: Kacper Kowalik (Xarthisius) gmail c= om> AuthorDate: Wed Feb 8 10:48:38 2012 +0000 Commit: Kacper Kowalik gentoo org> CommitDate: Wed Feb 8 10:48:38 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D55732526 [sci-libs/gmsh] bump to EAPI4 for required use, removed unused call to fl= ag-o-matic.eclass, shorten description, fix dependencies on libpng and zl= ib, remove redundant dependency on cmake, use PATCHES instead of calling = src_unpack, mycmakeargs is now bash array, remove obsolete dies, compile = doc during src_compile --- sci-libs/gmsh/gmsh-2.5.0-r1.ebuild | 58 +++++++++++++++---------------= ------ 1 files changed, 24 insertions(+), 34 deletions(-) diff --git a/sci-libs/gmsh/gmsh-2.5.0-r1.ebuild b/sci-libs/gmsh/gmsh-2.5.= 0-r1.ebuild index 2f9f1ab..16b4c6b 100644 --- a/sci-libs/gmsh/gmsh-2.5.0-r1.ebuild +++ b/sci-libs/gmsh/gmsh-2.5.0-r1.ebuild @@ -2,11 +2,11 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ =20 -EAPI=3D3 +EAPI=3D4 =20 -inherit cmake-utils flag-o-matic fortran-2 toolchain-funcs +inherit cmake-utils fortran-2 toolchain-funcs =20 -DESCRIPTION=3D"A three-dimensional finite element mesh generator with bu= ilt-in pre- and post-processing facilities" +DESCRIPTION=3D"3D finite element mesh generator with built-in pre- and p= ost-processing facilities" HOMEPAGE=3D"http://www.geuz.org/gmsh/" SRC_URI=3D"http://www.geuz.org/gmsh/src/${P}-source.tgz" =20 @@ -18,6 +18,8 @@ KEYWORDS=3D"~amd64 ~x86" IUSE=3D"blas cgns chaco doc examples jpeg lua med metis mpi netgen openc= ascade petsc taucs tetgen X" =20 RDEPEND=3D"virtual/fortran + media-libs/libpng + sys-libs/zlib X? ( x11-libs/fltk:1 ) blas? ( virtual/blas virtual/lapack sci-libs/fftw:3.0 ) cgns? ( sci-libs/cgnslib ) @@ -27,38 +29,23 @@ RDEPEND=3D"virtual/fortran opencascade? ( sci-libs/opencascade ) petsc? ( sci-mathematics/petsc ) mpi? ( virtual/mpi[cxx] ) - taucs? ( sci-libs/taucs )" - -# taucs needs metis enabled. -# Wait for the REQUIRED_USE syntax in EAPI4. -# http://www.gentoo.org/proj/en/council/meeting-logs/20101130-summary.tx= t + taucs? ( sci-libs/taucs ) + " =20 DEPEND=3D"${RDEPEND} - dev-util/cmake - media-libs/libpng - sys-libs/zlib doc? ( virtual/latex-base )" =20 S=3D${WORKDIR}/${P}-source =20 -pkg_setup() { - fortran-2_pkg_setup -} +PATCHES=3D( "${FILESDIR}/${P}-libpng-1.5.patch" ) =20 -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/${P}-libpng-1.5.patch" -} +REQUIRED_USE=3D"taucs? ( metis )" =20 src_configure() { - local mycmakeargs=3D"" - use blas && \ - mycmakeargs=3D"${mycmakeargs} - -DCMAKE_Fortran_COMPILER=3D$(tc-getF77)" + myargs=3D"-DCMAKE_Fortran_COMPILER=3D$(tc-getF77)" =20 - mycmakeargs=3D"${mycmakeargs} + mycmakeargs=3D( $(cmake-utils_use_enable blas BLAS_LAPACK) $(cmake-utils_use_enable cgns CGNS) $(cmake-utils_use_enable chaco CHACO) @@ -71,26 +58,29 @@ src_configure() { $(cmake-utils_use_enable taucs TAUCS) $(cmake-utils_use_enable tetgen TETGEN) $(cmake-utils_use_enable opencascade OCC) - $(cmake-utils_use_enable petsc PETSC)" + $(cmake-utils_use_enable petsc PETSC) + ${myargs} + ) # $(cmake-utils_use_enable tetgen TETGEN_NEW) =20 - cmake-utils_src_configure ${mycmakeargs} \ - || die "cmake configuration failed" + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile + if use doc ; then + emake pdf -C "${CMAKE_BUILD_DIR}" + fi } =20 src_install() { cmake-utils_src_install =20 # TODO: tutorials get installed twice ATM - if use doc ; then - cd "${CMAKE_BUILD_DIR}" - emake pdf || die "failed to build documentation" - cd "${S}" - dodoc doc/texinfo/gmsh.pdf - fi + use doc && dodoc doc/texinfo/gmsh.pdf =20 if use examples ; then insinto /usr/share/doc/${PF} - doins -r demos tutorial || die "failed to install examples" + doins -r demos tutorial fi }