avoid unconditional pg_config sourcing by usex

Signed-off-by: Andrew Savchenko <bircoph@gentoo.org>
Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x565953B95372756C

4 files changed, 32 insertions, 21 deletions

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index a0872eef593b..6f52ac7f6cde 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-physics/root
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.149 2015/07/16 22:16:37 bircoph Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.150 2015/07/18 09:40:19 bircoph Exp $
+
+  18 Jul 2015; Andrew Savchenko <bircoph@gentoo.org> root-5.34.26.ebuild,
+  root-5.34.28-r1.ebuild:
+  Do not use usex for postgres to avoid pg_config unconditional
+  sourcing. See bug 555246.
 
   16 Jul 2015; Andrew Savchenko <bircoph@gentoo.org> root-5.34.28-r1.ebuild:
   root-5.34.xx can't be used with >=pythia-8.2, see
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 16f4810e29d9..9640bfe8586a 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -37,25 +37,25 @@ DIST root_v5.34.28.source.tar.gz 75178811 SHA256 aae8fbcd86ad78ded68e764f294ab49
 DIST root_v6.02.05.source.tar.gz 99121880 SHA256 7a5d4af171ba3b8a736c462b2041f8f35bd4c1d3b6a22c32a3ebd3ffe144ae60 SHA512 b30bc4aafe294ee069ee4c884ff70c983539a48eda586cd1938d00d4688f10e94a435640965b89c6d100fdd998453a4c1ae2109d5f1427f23865a868c561d684 WHIRLPOOL de363835fa00ffa0ff6e596b3c92b59ed59378bac3a344c066f7603d6104058203f76181d4c15478fd9066aedbe6a514257d5796feedb2d5d0d789b263e92955
 DIST rootdrawing-logo.png 15051 SHA256 1dfd913cad53a3ebd6bf560d14df918cab5a295cc7d155944a8e27284af83a6b SHA512 14aa13ebfed3c9412d7d7d04c250740b25fe3af6bcb07e618045a5cec2dc23698a251fd7df2db1a6c37331084db99b029b387ea81c25ac825fc7ae10ad164a68 WHIRLPOOL 877a959a5aead73ba69dbb805c9869cbd6a047ea476bd4e7fef80781563a61d20dad49dd4d8b0005bfc58e8f7c7d38efbb3e085a95974feb81dfc9e339c18741
 EBUILD root-5.32.03-r2.ebuild 11346 SHA256 2431e382432c6cb26f556cc800c942fd0da3eb4bbe134e9fc4715074798d753f SHA512 064c484c73010598cbfa3664b6d004c33ea0766b31a39c4a59ce0a1cfc4f06f168488e4b8c9e524e1500e3d7584a51ab87f0ff82df92feff670e6b4b11266846 WHIRLPOOL 579ae021c54867895a4c627f1e06a3bba81e9d8fe84a97af3df506b485ce31b05e667b7aec940572d100b010f5d079f8ad32035185841d5eed170a97b0b81a43
-EBUILD root-5.34.26.ebuild 12355 SHA256 296d9c69d904646749795812bf0b2a9a059cf7bfaa0c0951ab024280bc8a21af SHA512 b0124171569702178aa034e2b64777117eb508305d03547d3794b34552b8017f7dc56783bd2d63a49dcd188c1e8d31a8c271bb76430e3d93d8d5071befa81bc4 WHIRLPOOL cf06ad5e9e3d9391e38521f8a12374acfca6b411f1a4d6f89e973ec0c372e85d4274ea3ff822bc1e46b45e48de764ca411d2af44c38bb68802c2f08bbdbc45ea
-EBUILD root-5.34.28-r1.ebuild 12044 SHA256 6c42501309e7ebcfd60372761ce1d27bd90b76300a052fec0451690a5540ec82 SHA512 9e3abc36b0eadc376b4fef8adb8da897041eedd5ea388b1c80c364c4e88a876f1f7499007557d1538c6d34866686343672901f352c83e95140304159bda50883 WHIRLPOOL 8a4b5b32024a95b20708f0e83398d5d19856ae42c9fb061dfcd872807cc0a4ef2d4e99e54a66b13cbf7aff3c324c313405ba3a1dfa5cec3064c9088af95eb2b8
+EBUILD root-5.34.26.ebuild 12451 SHA256 ad9e7c8777155ef8158000cf789e62be17d071121a745ddca748c10408cba216 SHA512 70aba5e1312a46b2d24b51cd33c1d9953d3ba844bbdfc881f986da00790f1e6e004a5471bfae8153faf1817a1ad2b2941202192f5e2988a79a243834898a682f WHIRLPOOL 4269f2877c8a50c0e4a2c7419725fd977c317c7f629ffdae5fd958852f65829c660f461eb1ad22f7fada4e5755a66953e499763c4a89a220831a231f47ad8fb3
+EBUILD root-5.34.28-r1.ebuild 12141 SHA256 6b2fa699ee62af495c6082bfb387bf9230f5c4faefe1b77689dd648197d3fcae SHA512 cec0eeefaba44409c4cf3f36be152585af113da7b9ba05a099f288e398f883a14c2e489dbd460bdd6cce1a169c6564748010e708051dc654e11d33b8dcdb2243 WHIRLPOOL b48757ee655c4d1a5af0a42cbb4eb89a9f059698ebb30a059b1be9197f267ed03f152c217a085599b58de8961f63de910c43ca5f5a9a77499bddf4b5b290d94b
 EBUILD root-6.02.05-r2.ebuild 14407 SHA256 27ca376ebac4e06cd90d8568ad33abf962fbe3ba3f9ec5d651af2b39aac1684a SHA512 5c0df17fd8fefb4c3349b24d2f4204715dccb83676541441b4133ac979879cc1266fab3e488f3036dca81377dac7325e389c139909c70571ab0e01eb333782f8 WHIRLPOOL 691f1597630c24254fda24e4aeba41fffb385c22851f2f83a79212b0ad165579e69f4a226f6d0cc11494187ff3f75ea4373501d9b6bb6f4c79b7a73c805b7205
-MISC ChangeLog 43130 SHA256 aec1839bc22f1432918427e9a8a232fb338a5d1b91289b4d4ae0e9a4614d0729 SHA512 7a5efa0ea8ca00dce8fde490ff51635ce4889d7e8e33f988b14d26fa8cc05f56bb8dda7eff0921c7cf95ceb0d6b3f3c38788a9fa3cc3b7257dfd9fa2265f75ed WHIRLPOOL c9efb668c1d07d84737c0576ba0b7325e7eb907cdb7974666ac72178d54a37605abaccca3f6f6d201900a5e13ddf02df8e07644e535c0fa25edc78f16004190f
+MISC ChangeLog 43323 SHA256 e151613582c1d9932475919df847779b06c960838b5eb27157e3ab3ed9477d0e SHA512 2b22439be0652265717bdf383419dd1c7114f2099c1e462a4974c94de67d4f4e745de250888054b961d8d66aad3ccac8cce9a90a595aa79ee6774cc544291299 WHIRLPOOL c7f42122716a8661fc8043322021427985109364841d266312b39c5a18987acec501dafc1635025ea8e482ce694b17632a1f1988ad5c677e87bf939a0d0ba4e8
 MISC metadata.xml 2037 SHA256 782a0418ce7592d98fb0a0ea39acb4fdda34c8e5693916203c7603c2a6949d82 SHA512 2dd71edf2ef82897be6d4f7cf5454ae26c5c1aaeeca158828b79e67367f16de280c67dd26a20e783bbcb1005f5b190166ccb119abbf0b417bed69e58d6169923 WHIRLPOOL a82e8e4a80f3d5994c42137c46bc59267b64ffb89cf66f22a4803608d53cca56b763f66895ae8efc6150f747ea45f0c00905272a9c52c7f5381930509343728c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVqC1GAAoJEPZTWjO6HuSNY7cQAIuyBRbAL1VETKzeVsXg0gM9
-b9LQA/jTGmyVxtflPz0ncV0cwv3BkwMkp40573eOh9kZnCog35SqSeSKZ5mZH7Pz
-mvR4vBjy08oZD/kYq0BhA2VgfVCcu7lMunMMBaY/uskWXCjMOsCH7UUvqkSeI3Tr
-dtpl5q00rqaJQ4zlYK0BiPRlwe9wwSWif83jS1jMO3lEk8T0A8vUT3O3wFMhwFy7
-TPkTGAJZ0iE83nCKH54hnqEglMuMXvNRvfn9rcLmt80tWrvB30Ve6ExPshSMsGtc
-6jWDRpM0v+SR/nZ1GUV7O8HmhSf94/M7f1/+91VhezJa1uiJYfz8PcfgoYSPO4t3
-+CN1iDXW9Qd4D0u/4nql4G8RG/m+pAuz85EhlTRKOpogqJDNbDMZJBueLlSbOpn5
-bAxzguVvmYRbOMAO3OmEX9kfeHEAD55jloG28BNMl9+e456HnxMUEy6t+z4Xdr9S
-+V5phWo/Dvcs0xNdYmxzQAuAsDz7t9dNymG4uwWJlFhO0b+km5ZBpuUE4LC2BQbb
-9zRqVFuM52YY7LpkVBAeKx1szpcPeUT6B+VY/HBg9BPE3Sz0jHkFeJv5fkB+ejml
-Dk8In2U26yizraPPgy+vQtjBhf1y1gmHKnmRqQ5W7WARIaaeovjNgqAbbjrpjkCz
-yGxKdVihZCfyqpw2zZSh
-=tfFS
+iQIcBAEBCAAGBQJVqh8aAAoJEPZTWjO6HuSN6eQP/iLyxnJSeEKqrmwIpnowbrpN
+lmUDsXdTTuNw7jOSLnm247YtlD7UjGhfB88bl3g/yWsSYfDtf3MYOHPxCFRNtZ9F
+7EGlc0b42MzHuPeFSx/GxfobSV8Nrpz+AyyImZ8wUscflT3YOoM99HGKT8Zbdb7/
+hF90oMw1iSCQklUYGebFpbSzQRX5R+IPekf3bF13kxWDLovvmwyvQjIMUvbUwe8V
+XWRp5R5Dt5X5w3Wuao3T2ccxHtwW/Ordt9Vh1XP4aQd7rcNPQ6u38DiajvirBnfA
+fLKTe45XInITtfj6olTSWD20AJRZoRIttV8VuQHb8U4i6EbiybrUEzGI0CIOT+uD
+tzDh3FaUqolUQeha3XCztaoYAy13WsXZ0uOJbN4AcDQ8iv7w+5ncxIG6MWOi9T/q
+VCUGEvczqlAe+djKVg41aqfDwL/7sXxX1+dON8gHSdrtKtsMNqnmAkAkorJQaWtL
+ZaQtI8ztPY1j3XfF2EYMwG6SLgatLBm+t3j0eMEkZjqQbs3FJgs08KDZDtsUHFex
+IE68rFahvepefAEqGmj3RYNWp+AmirLU1/ZlujgVvtlp2jJx5slCvq8vH8zAqLsP
+Q+rtbwQTqXlRMwVxyP70GQKVsKlPw7cMZu12Ag+OlYIzIfQmKMNQ4VepUhrunUfp
+z3JP4jffZ8cTyr4JwITR
+=o1uP
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/root/root-5.34.26.ebuild b/sci-physics/root/root-5.34.26.ebuild
index da4549a48082..a0efccc812ba 100644
--- a/sci-physics/root/root-5.34.26.ebuild
+++ b/sci-physics/root/root-5.34.26.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.26.ebuild,v 1.5 2015/07/16 21:22:10 bircoph Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.26.ebuild,v 1.6 2015/07/18 09:40:19 bircoph Exp $
 
 EAPI=5
 
@@ -327,7 +327,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)
@@ -345,6 +344,10 @@ src_configure() {
 		)
 	fi
 
+	# 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"
 }
 
diff --git a/sci-physics/root/root-5.34.28-r1.ebuild b/sci-physics/root/root-5.34.28-r1.ebuild
index 62ee744bf319..be6716ee823f 100644
--- a/sci-physics/root/root-5.34.28-r1.ebuild
+++ b/sci-physics/root/root-5.34.28-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.28-r1.ebuild,v 1.3 2015/07/16 22:16:37 bircoph Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.28-r1.ebuild,v 1.4 2015/07/18 09:40:19 bircoph Exp $
 
 EAPI=5
 
@@ -311,7 +311,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)
@@ -331,6 +330,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"
 }