[gentoo-commits] proj/sci:master commit in: sci-physics/root/

[Andrew Savchenko]

commit:     26e7e22ae62b45403d98c7ca6054561cd7fd28e3
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Sun Apr 12 17:58:50 2015 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Sun Apr 12 17:58:50 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=26e7e22a

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 <birc...@gentoo.org> 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 <birc...@gentoo.org> -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"
 }