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 40E79138247 for ; Mon, 6 Jan 2014 19:27:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6971CE0BAD; Mon, 6 Jan 2014 19:27:15 +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 BF00BE0B88 for ; Mon, 6 Jan 2014 19:27:13 +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 A4F0333F75C for ; Mon, 6 Jan 2014 19:27:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id D86BFE5537 for ; Mon, 6 Jan 2014 19:27:10 +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: <1389036300.8de8e76ee16740994be36c8e584fe8ead21550ac.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/fgsl/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/fgsl/ChangeLog sci-libs/fgsl/fgsl-0.9.3.ebuild sci-libs/fgsl/fgsl-0.9.4.ebuild sci-libs/fgsl/metadata.xml X-VCS-Directories: sci-libs/fgsl/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 8de8e76ee16740994be36c8e584fe8ead21550ac X-VCS-Branch: master Date: Mon, 6 Jan 2014 19:27:10 +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: 379ac7e2-af10-4e20-bdb9-f28f01d536de X-Archives-Hash: fa28892db0e20589f8e24ec5799c58f0 commit: 8de8e76ee16740994be36c8e584fe8ead21550ac Author: Justin Lecher gentoo org> AuthorDate: Mon Jan 6 19:25:00 2014 +0000 Commit: Justin Lecher gentoo org> CommitDate: Mon Jan 6 19:25:00 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=8de8e76e sci-libs/fgsl: Don't use plain pkg-config Package-Manager: portage-2.2.8 --- sci-libs/fgsl/ChangeLog | 6 +++++- sci-libs/fgsl/fgsl-0.9.3.ebuild | 30 ++++++++++++++++++------------ sci-libs/fgsl/fgsl-0.9.4.ebuild | 29 ++++++++++++++++++----------- sci-libs/fgsl/metadata.xml | 12 ++++++------ 4 files changed, 47 insertions(+), 30 deletions(-) diff --git a/sci-libs/fgsl/ChangeLog b/sci-libs/fgsl/ChangeLog index 9013e80..d157df1 100644 --- a/sci-libs/fgsl/ChangeLog +++ b/sci-libs/fgsl/ChangeLog @@ -1,7 +1,11 @@ # ChangeLog for sci-libs/fgsl -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 06 Jan 2014; Justin Lecher fgsl-0.9.3.ebuild, + fgsl-0.9.4.ebuild, metadata.xml: + Don't use plain pkg-config + *fgsl-0.9.4 (28 Jun 2011) 28 Jun 2011; Justin Lecher fgsl-0.9.3.ebuild, diff --git a/sci-libs/fgsl/fgsl-0.9.3.ebuild b/sci-libs/fgsl/fgsl-0.9.3.ebuild index cb37221..93e52e3 100644 --- a/sci-libs/fgsl/fgsl-0.9.3.ebuild +++ b/sci-libs/fgsl/fgsl-0.9.3.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=4 +EAPI=5 inherit eutils fortran-2 multilib toolchain-funcs @@ -15,28 +15,34 @@ SLOT="0" KEYWORDS="~amd64" IUSE="static-libs" -DEPEND=" - >=sci-libs/gsl-1.14 - virtual/fortran" -RDEPEND="${DEPEND}" +RDEPEND=">=sci-libs/gsl-1.14" +DEPEND="${RDEPEND} + virtual/pkgconfig" #TODO: make docs FORTRAN_STANDARD=90 src_prepare() { epatch "${FILESDIR}"/${P}-sharedlibs.patch - use amd64 && ln -s interface/integer_ilp64.finc integer.finc - use x86 && ln -s interface/integer_ilp32.finc integer.finc + if use amd64; then + ln -s interface/integer_ilp64.finc integer.finc || die + elif use x86; then + ln -s interface/integer_ilp32.finc integer.finc || die + else + die "Don't know who you are" + fi + cat <<- EOF > "${S}/make.inc" F90 = $(tc-getFC) CC = $(tc-getCC) - GSL_LIB = $(pkg-config --libs gsl) - GSL_INC = $(pkg-config --cflags gsl) + GSL_LIB = $($(tc-getPKG_CONFIG) --libs gsl) + GSL_INC = $($(tc-getPKG_CONFIG) --cflags gsl) PREFIX = /usr ARFLAGS = -csrv FPP = -cpp LIB = $(get_libdir) EOF + use static-libs && echo "STATIC_LIBS = yes" >> "${S}/make.inc" } @@ -46,8 +52,8 @@ src_configure() { src_install() { dodoc NEWS README - ln -s lib${PN}.so.0.0.0 lib${PN}.so.0 - ln -s lib${PN}.so.0.0.0 lib${PN}.so + ln -s lib${PN}.so.0.0.0 lib${PN}.so.0 || die + ln -s lib${PN}.so.0.0.0 lib${PN}.so || die dolib.so lib${PN}.so* insinto /usr/include doins ${PN}.mod diff --git a/sci-libs/fgsl/fgsl-0.9.4.ebuild b/sci-libs/fgsl/fgsl-0.9.4.ebuild index d5fef48..e5e717f 100644 --- a/sci-libs/fgsl/fgsl-0.9.4.ebuild +++ b/sci-libs/fgsl/fgsl-0.9.4.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=4 +EAPI=5 inherit eutils fortran-2 multilib toolchain-funcs @@ -15,27 +15,34 @@ SLOT="0" KEYWORDS="~amd64 ~amd64-linux" IUSE="static-libs" -DEPEND=">=sci-libs/gsl-1.15 - virtual/fortran" -RDEPEND="${DEPEND}" +RDEPEND=">=sci-libs/gsl-1.14" +DEPEND="${RDEPEND} + virtual/pkgconfig" #TODO: make docs FORTRAN_STANDARD=90 src_prepare() { epatch "${FILESDIR}"/${PN}-0.9.3-sharedlibs.patch - use amd64 && ln -s interface/integer_ilp64.finc integer.finc - use x86 && ln -s interface/integer_ilp32.finc integer.finc + if use amd64; then + ln -s interface/integer_ilp64.finc integer.finc || die + elif use x86; then + ln -s interface/integer_ilp32.finc integer.finc || die + else + die "Don't know who you are" + fi + cat <<- EOF > "${S}/make.inc" F90 = $(tc-getFC) CC = $(tc-getCC) - GSL_LIB = $(pkg-config --libs gsl) - GSL_INC = $(pkg-config --cflags gsl) + GSL_LIB = $($(tc-getPKG_CONFIG) --libs gsl) + GSL_INC = $($(tc-getPKG_CONFIG) --cflags gsl) PREFIX = /usr ARFLAGS = -csrv FPP = -cpp LIB = $(get_libdir) EOF + use static-libs && echo "STATIC_LIBS = yes" >> "${S}/make.inc" } @@ -45,8 +52,8 @@ src_configure() { src_install() { dodoc NEWS README - ln -s lib${PN}.so.0.0.0 lib${PN}.so.0 - ln -s lib${PN}.so.0.0.0 lib${PN}.so + ln -s lib${PN}.so.0.0.0 lib${PN}.so.0 || die + ln -s lib${PN}.so.0.0.0 lib${PN}.so || die dolib.so lib${PN}.so* insinto /usr/include doins ${PN}.mod diff --git a/sci-libs/fgsl/metadata.xml b/sci-libs/fgsl/metadata.xml index 111e6a5..9cbb8f9 100644 --- a/sci-libs/fgsl/metadata.xml +++ b/sci-libs/fgsl/metadata.xml @@ -1,10 +1,10 @@ - sci - - xarthisius@gentoo.org - Kacper Kowalik - - FGSL: A Fortran interface to the GNU Scientific Library + sci + + xarthisius@gentoo.org + Kacper Kowalik + + FGSL: A Fortran interface to the GNU Scientific Library