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 0A315138CA3 for ; Mon, 13 Apr 2015 06:25:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9F11DE0A70; Mon, 13 Apr 2015 06:25:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 15525E0A72 for ; Mon, 13 Apr 2015 06:25:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5E030340AA1 for ; Mon, 13 Apr 2015 06:25:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5DB9E15D0E for ; Mon, 13 Apr 2015 06:25: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: <1428906281.4e236412cc2d3f5ba06a78260a477eb3de130d45.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-physics/root/ X-VCS-Repository: proj/sci X-VCS-Files: sci-physics/root/ChangeLog sci-physics/root/root-6.02.05-r2.ebuild X-VCS-Directories: sci-physics/root/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 4e236412cc2d3f5ba06a78260a477eb3de130d45 X-VCS-Branch: master Date: Mon, 13 Apr 2015 06:25: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: e4a16373-6db8-4a96-bf36-6027111001f4 X-Archives-Hash: 46b3f71f3f60c13e37310cad3af31b33 commit: 4e236412cc2d3f5ba06a78260a477eb3de130d45 Author: Andrew Savchenko gmail com> AuthorDate: Sun Apr 12 17:58:50 2015 +0000 Commit: Justin Lecher gentoo org> CommitDate: Mon Apr 13 06:24:41 2015 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=4e236412 sci-physics/root: fix pg_config QA sci-physics/root/ChangeLog | 4 ++++ sci-physics/root/root-6.02.05-r2.ebuild | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog index 4fc73e8..ac89d27 100644 --- a/sci-physics/root/ChangeLog +++ b/sci-physics/root/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.96 2012/03/29 18:21:49 bicatali Exp $ + 12 Apr 2015; Andrew Savchenko root-6.02.05-r2.ebuild: + Fix "pg_config: command not found" QA warning if postgres is not + installed. + *root-6.02.05-r2 (12 Apr 2015) 12 Apr 2015; Andrew Savchenko -root-6.02.05-r1.ebuild, diff --git a/sci-physics/root/root-6.02.05-r2.ebuild b/sci-physics/root/root-6.02.05-r2.ebuild index 9069f3a..b69ac9f 100644 --- a/sci-physics/root/root-6.02.05-r2.ebuild +++ b/sci-physics/root/root-6.02.05-r2.ebuild @@ -348,7 +348,6 @@ src_configure() { $(use_enable opengl) $(use_enable oracle) $(use_enable postgres pgsql) - $(usex postgres "--with-pgsql-incdir=$(pg_config --includedir)" "") $(use_enable prefix rpath) $(use_enable pythia6) $(use_enable pythia8) @@ -365,6 +364,10 @@ src_configure() { ${EXTRA_ECONF} ) + # usex can't be used here, because pg_config may be not + # installed with USE="-postgres" + use postgres && myconf+=( --with-pgsql-incdir=$(pg_config --includedir) ) + ./configure ${myconf[@]} || die "configure failed" }