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 1CE5D198005 for ; Wed, 27 Feb 2013 17:23:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C8093E07A8; Wed, 27 Feb 2013 17:23:44 +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 1DBFFE07A8 for ; Wed, 27 Feb 2013 17:23:44 +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 E863A33DF4B for ; Wed, 27 Feb 2013 17:23:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 8B858E4290 for ; Wed, 27 Feb 2013 17:23:41 +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: <1361984630.5aa4f6f7a3eb16cc92ef192bbde227e8326b7c82.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-chemistry/simpson/files/, sci-chemistry/simpson/ X-VCS-Repository: proj/sci X-VCS-Files: sci-chemistry/simpson/ChangeLog sci-chemistry/simpson/files/3.0.1-gentoo.patch sci-chemistry/simpson/files/3.1.0-gentoo.patch sci-chemistry/simpson/files/3.1.2-gentoo.patch sci-chemistry/simpson/simpson-3.0.1.ebuild sci-chemistry/simpson/simpson-3.1.0.ebuild sci-chemistry/simpson/simpson-3.1.2.ebuild X-VCS-Directories: sci-chemistry/simpson/files/ sci-chemistry/simpson/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 5aa4f6f7a3eb16cc92ef192bbde227e8326b7c82 X-VCS-Branch: master Date: Wed, 27 Feb 2013 17:23:41 +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: 260a68ce-cd75-4787-9e14-9e88607119b4 X-Archives-Hash: 44089bb26aa4fe541141af85cb250f02 commit: 5aa4f6f7a3eb16cc92ef192bbde227e8326b7c82 Author: Justin Lecher gentoo org> AuthorDate: Wed Feb 27 17:03:50 2013 +0000 Commit: Justin Lecher gentoo org> CommitDate: Wed Feb 27 17:03:50 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=5aa4f6f7 sci-chemistry/simpson: Use PKG_CONFIG instead of generic pkg-config Package-Manager: portage-2.2.0_alpha163 --- sci-chemistry/simpson/ChangeLog | 5 +++++ sci-chemistry/simpson/files/3.0.1-gentoo.patch | 2 +- sci-chemistry/simpson/files/3.1.0-gentoo.patch | 2 +- sci-chemistry/simpson/files/3.1.2-gentoo.patch | 2 +- sci-chemistry/simpson/simpson-3.0.1.ebuild | 3 ++- sci-chemistry/simpson/simpson-3.1.0.ebuild | 3 ++- sci-chemistry/simpson/simpson-3.1.2.ebuild | 3 ++- 7 files changed, 14 insertions(+), 6 deletions(-) diff --git a/sci-chemistry/simpson/ChangeLog b/sci-chemistry/simpson/ChangeLog index cbbfccd..386dae8 100644 --- a/sci-chemistry/simpson/ChangeLog +++ b/sci-chemistry/simpson/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 27 Feb 2013; Justin Lecher files/3.0.1-gentoo.patch, + files/3.1.0-gentoo.patch, files/3.1.2-gentoo.patch, simpson-3.0.1.ebuild, + simpson-3.1.0.ebuild, simpson-3.1.2.ebuild: + Use PKG_CONFIG instead of generic pkg-config + 22 Feb 2013; Justin Lecher simpson-3.0.1.ebuild, simpson-3.1.0.ebuild, simpson-3.1.2.ebuild, metadata.xml: Add missing dep on virtual/pkgconfig diff --git a/sci-chemistry/simpson/files/3.0.1-gentoo.patch b/sci-chemistry/simpson/files/3.0.1-gentoo.patch index 61d170f..77c886d 100644 --- a/sci-chemistry/simpson/files/3.0.1-gentoo.patch +++ b/sci-chemistry/simpson/files/3.0.1-gentoo.patch @@ -9,7 +9,7 @@ index c5f6fcf..25e328f 100644 -INCLUDES = -I/usr/include/tcl8.5 -LIBRARIES = -lm -lgslcblas -llapack -ltcl8.5 +INCLUDES = -I@GENTOO_PORTAGE_EPREFIX@/usr/include/ -+BLASLIBS = `pkg-config --libs cblas lapack` ++BLASLIBS = `$(PKG_CONFIG) --libs cblas lapack` +LIBRARIES = -lm ${BLASLIBS} -ltcl FLAGS = -c -O3 diff --git a/sci-chemistry/simpson/files/3.1.0-gentoo.patch b/sci-chemistry/simpson/files/3.1.0-gentoo.patch index 3424cb9..7675d79 100644 --- a/sci-chemistry/simpson/files/3.1.0-gentoo.patch +++ b/sci-chemistry/simpson/files/3.1.0-gentoo.patch @@ -13,7 +13,7 @@ index 7206ba5..832e76a 100644 -#LIBRARIES = -lm -llapack -lblas -ltcl8.4 -#BINDIR = /usr/local/bin +INCLUDES = -I@GENTOO_PORTAGE_EPREFIX@/usr/include/ -+BLASLIBS = `pkg-config --libs cblas lapack` ++BLASLIBS = `$(PKG_CONFIG) --libs cblas lapack` +LIBRARIES = -lm ${BLASLIBS} -ltcl # Linux MPI diff --git a/sci-chemistry/simpson/files/3.1.2-gentoo.patch b/sci-chemistry/simpson/files/3.1.2-gentoo.patch index a820012..d81daea 100644 --- a/sci-chemistry/simpson/files/3.1.2-gentoo.patch +++ b/sci-chemistry/simpson/files/3.1.2-gentoo.patch @@ -73,7 +73,7 @@ index 216955d..ba54573 100644 + +# Linux +INCLUDES = -I@GENTOO_PORTAGE_EPREFIX@/usr/include/ -+BLASLIBS = `pkg-config --libs cblas lapack` ++BLASLIBS = `$(PKG_CONFIG) --libs cblas lapack` +LIBRARIES = -lm ${BLASLIBS} -ltcl + +# Linux MPI diff --git a/sci-chemistry/simpson/simpson-3.0.1.ebuild b/sci-chemistry/simpson/simpson-3.0.1.ebuild index 6b0911a..6777509 100644 --- a/sci-chemistry/simpson/simpson-3.0.1.ebuild +++ b/sci-chemistry/simpson/simpson-3.0.1.ebuild @@ -4,7 +4,7 @@ EAPI=4 -inherit eutils prefix +inherit eutils prefix toolchain-funcs DESCRIPTION="General-purpose software package for simulation virtually all kinds of solid-state NMR experiments" HOMEPAGE="http://bionmr.chem.au.dk/bionmr/software/index.php" @@ -28,6 +28,7 @@ DEPEND="${RDEPEND} S="${WORKDIR}"/${PN}-source-${PV} src_prepare() { + tc-export PKG_CONFIG edos2unix Makefile epatch "${FILESDIR}"/${PV}-gentoo.patch epatch "${FILESDIR}"/${PV}-type.patch diff --git a/sci-chemistry/simpson/simpson-3.1.0.ebuild b/sci-chemistry/simpson/simpson-3.1.0.ebuild index 5f73f9e..75e9f8e 100644 --- a/sci-chemistry/simpson/simpson-3.1.0.ebuild +++ b/sci-chemistry/simpson/simpson-3.1.0.ebuild @@ -4,7 +4,7 @@ EAPI=4 -inherit eutils prefix +inherit eutils prefix toolchain-funcs DESCRIPTION="General-purpose software package for simulation virtually all kinds of solid-state NMR experiments" HOMEPAGE="http://bionmr.chem.au.dk/bionmr/software/index.php" @@ -28,6 +28,7 @@ DEPEND="${RDEPEND} S="${WORKDIR}"/${PN}-source-${PV} src_prepare() { + tc-export PKG_CONFIG edos2unix Makefile epatch "${FILESDIR}"/${PV}-gentoo.patch epatch "${FILESDIR}"/3.0.1-type.patch diff --git a/sci-chemistry/simpson/simpson-3.1.2.ebuild b/sci-chemistry/simpson/simpson-3.1.2.ebuild index 5f73f9e..75e9f8e 100644 --- a/sci-chemistry/simpson/simpson-3.1.2.ebuild +++ b/sci-chemistry/simpson/simpson-3.1.2.ebuild @@ -4,7 +4,7 @@ EAPI=4 -inherit eutils prefix +inherit eutils prefix toolchain-funcs DESCRIPTION="General-purpose software package for simulation virtually all kinds of solid-state NMR experiments" HOMEPAGE="http://bionmr.chem.au.dk/bionmr/software/index.php" @@ -28,6 +28,7 @@ DEPEND="${RDEPEND} S="${WORKDIR}"/${PN}-source-${PV} src_prepare() { + tc-export PKG_CONFIG edos2unix Makefile epatch "${FILESDIR}"/${PV}-gentoo.patch epatch "${FILESDIR}"/3.0.1-type.patch