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 36EAB59CA3 for ; Mon, 14 Mar 2016 02:17:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5006E21C028; Mon, 14 Mar 2016 02:17:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2D68B21C02C for ; Mon, 14 Mar 2016 02:17:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 648B8340B25 for ; Mon, 14 Mar 2016 02:17:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AE56285E for ; Mon, 14 Mar 2016 02:17:42 +0000 (UTC) From: "Christoph Junghans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Christoph Junghans" Message-ID: <1457384649.df709aa96619b7ca5247a47ce9d06df914355879.ottxor@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-astronomy/scamp/ X-VCS-Repository: proj/sci X-VCS-Files: sci-astronomy/scamp/scamp-9999.ebuild X-VCS-Directories: sci-astronomy/scamp/ X-VCS-Committer: ottxor X-VCS-Committer-Name: Christoph Junghans X-VCS-Revision: df709aa96619b7ca5247a47ce9d06df914355879 X-VCS-Branch: master Date: Mon, 14 Mar 2016 02:17:42 +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: 6ae5b784-4535-4a8e-b1d5-8b247787f1b6 X-Archives-Hash: 233084d5523b2a073fcdeb960cb13110 commit: df709aa96619b7ca5247a47ce9d06df914355879 Author: Sébastien Fabbro gentoo org> AuthorDate: Thu Mar 3 19:12:53 2016 +0000 Commit: Christoph Junghans gentoo org> CommitDate: Mon Mar 7 21:04:09 2016 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=df709aa9 sci-astronomy/scamp: fixed atlas detection and curl dependency sci-astronomy/scamp/scamp-9999.ebuild | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/sci-astronomy/scamp/scamp-9999.ebuild b/sci-astronomy/scamp/scamp-9999.ebuild index 0964de7..8b07c7a 100644 --- a/sci-astronomy/scamp/scamp-9999.ebuild +++ b/sci-astronomy/scamp/scamp-9999.ebuild @@ -19,7 +19,7 @@ SLOT="0" IUSE="doc plplot threads" RDEPEND=" - >=sci-astronomy/cdsclient-3.4 + net-misc/curl:= sci-libs/atlas[lapack,threads=] sci-libs/fftw:3.0 plplot? ( sci-libs/plplot:= )" @@ -34,13 +34,10 @@ src_prepare() { [[ -e "${EPREFIX}"/usr/$(get_libdir)/libptclapack.so ]] && \ myclapack=ptclapack fi - sed -i \ - -e "s/-lcblas/-l${mycblas}/g" \ - -e "s/AC_CHECK_LIB(cblas/AC_CHECK_LIB(${mycblas}/g" \ - -e "s/-llapack/-l${myclapack}/g" \ - -e "s/\(lapack_lib=\).*/\1${myclapack}/g" \ - -e "s/AC_CHECK_LIB(lapack/AC_CHECK_LIB(${myclapack}/g" \ - acx_atlas.m4 || die + sed -e "s/-lcblas/-l${mycblas}/g"\ + -e "/SEARCH_LIBS/s/ cblas,/${mycblas},/g" \ + -e "/SEARCH_LIBS/s/lapack_atlas/${myclapack}/g" \ + -i acx_atlas.m4 || die eautoreconf subversion_src_prepare }