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

["Andrew Savchenko" <bircoph@gentoo.org>]

commit:     edac8a8350c5bd22f8f73f170439290f9b38a71b
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Sat Jul 18 09:44:37 2015 +0000
Commit:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Sat Jul 18 09:44:37 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=edac8a83

avoid unconditional pg_config sourcing by usex

 sci-physics/root/ChangeLog           | 4 ++++
 sci-physics/root/root-5.34.32.ebuild | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 10c7d9e..61a91bd 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 $
 
+  18 Jul 2015; Andrew Savchenko <bircoph@gentoo.org> root-5.34.32.ebuild:
+  Do not use usex for postgres to avoid pg_config unconditional sourcing. See
+  bug 555246.
+
 *root-5.34.32 (17 Jul 2015)
 
   17 Jul 2015; Andrew Savchenko <bircoph@gentoo.org> +root-5.34.32.ebuild,

diff --git a/sci-physics/root/root-5.34.32.ebuild b/sci-physics/root/root-5.34.32.ebuild
index 283102f..4b02cba 100644
--- a/sci-physics/root/root-5.34.32.ebuild
+++ b/sci-physics/root/root-5.34.32.ebuild
@@ -310,7 +310,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)
@@ -330,6 +329,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"
 }