QA: calculate configuration only once to make sure that the dependency check and the actual configuration are in sync; this should address bug #385595.

Package-Manager: portage-2.2.0_alpha60/cvs/Linux x86_64

3 files changed, 34 insertions, 31 deletions

diff --git a/www-apps/rt/ChangeLog b/www-apps/rt/ChangeLog
index 5be650b8620d..a1c8dfdbe299 100644
--- a/www-apps/rt/ChangeLog
+++ b/www-apps/rt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/rt
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/ChangeLog,v 1.64 2011/10/04 18:21:29 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/ChangeLog,v 1.65 2011/10/05 11:17:04 flameeyes Exp $
+
+  05 Oct 2011; Diego E. Pettenò <flameeyes@gentoo.org> rt-3.8.10.ebuild:
+  QA: calculate configuration only once to make sure that the dependency check
+  and the actual configuration are in sync; this should address bug #385595.
 
   04 Oct 2011; Kacper Kowalik <xarthisius@gentoo.org> rt-3.6.7.ebuild:
   ppc keywords dropped wrt #385591
diff --git a/www-apps/rt/Manifest b/www-apps/rt/Manifest
index 7624acfe7899..6087f83e22d5 100644
--- a/www-apps/rt/Manifest
+++ b/www-apps/rt/Manifest
@@ -11,15 +11,13 @@ AUX rt_apache2_fcgi.conf 989 RMD160 f88807ad0db9806ee2c638e998ab10e9339a9ed6 SHA
 DIST rt-3.6.7.tar.gz 1764471 RMD160 f14ce94a2d9fcb243c6fae274fc5602cae4692cd SHA1 990fd47899bed1ec8e7d23556853fb3a70d95479 SHA256 5916fe002d3739e670aef49a4b12aa385e45eea4602adcf12feaef583a73f6c1
 DIST rt-3.8.10.tar.gz 5642566 RMD160 779ba2e04e87d20f30b03a9e7348c23b09062038 SHA1 98678a4ce4dbdfb13ceeeb88236d49bd0f5562c7 SHA256 d121ec6463ce919cef74c3ce3ab7e7213cb235726d05abd26c717a7eab6c1448
 EBUILD rt-3.6.7.ebuild 6176 RMD160 68bf965c6f77ba9bd45e3b85529438661c9f15f2 SHA1 94645e330831b02c688d4c73586d33ea36f8262a SHA256 991bf23e729fa6888059c636c8aef1173a63c03f592d714edf0993a7c284fc31
-EBUILD rt-3.8.10.ebuild 6260 RMD160 5f0a82d5a5a28df894eb3e5f97c57eee1a29c173 SHA1 e424ae933bf295df3aa9f30c09056ea0dfdffa5f SHA256 921d33ef8865a1e3387d2517efe149a3331b205f1bf079f783062e7082436744
-MISC ChangeLog 10014 RMD160 e951ab66646bd1e0ee9ffa89503c81c325ea0462 SHA1 0381f41df0bf2514f5b6d4e1b2d66bedb3ffff18 SHA256 42ebd10787fe9e4d3a8a20569f55e645d3f11be37ccf712e0785e9c729d6d431
+EBUILD rt-3.8.10.ebuild 6291 RMD160 16c22fa909d98905c11d06c800c640455b1e81d6 SHA1 7543dd4c2caa61922ef9438f1452de19bd7f3550 SHA256 a30b424b6fe6b59a300b7be5164fc13f5d42e848bf0710f7dcc6714c1f24ce74
+MISC ChangeLog 10244 RMD160 48aa0b8bbf188d717c7d8b52a334e9f2a61ca111 SHA1 59c316ff671ff0c49fe3f0db7a4bd872b35f7230 SHA256 76765fd3b388fc5de3e77dc7846fe8128026c9120f1a42b4663a5c761e5bc4c7
 MISC metadata.xml 524 RMD160 295179b59cac47383471772520c6afaca965a448 SHA1 6e4ee23e5e9f00ce247226aacb3c133c9b35e3bc SHA256 589ec91d467e77ce4708fe59d3e4818137dd8188647461fbd68da4e4fcabfb92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQECAAYFAk6LTrEACgkQIiMqcbOVdxTQdAP5AdID5wIq78zC3kNaIWpXBrGa
-iFnZ7wG3dKexAR3bS+qG9RGT0gTWSEAk1MzV0VZ9Kc+lQVzwxr0tNT3JCG5dA9Ee
-OY2/FHoZjQ/JuEGWGGr3YfKj8KErrO33wY+LE5FOrbA8ROLg8Sh7/iICffoClEnz
-mCi+E29ydo/+izJefdc=
-=Bo/o
+iEYEARECAAYFAk6MPI8ACgkQAiZjviIA2XjbxACcDUOaQxX7VG9+Hp3PrmcjfCSf
+GPAAoIZ6cCz3ItBhpU9+i+/5xudL6Cp2
+=UXMi
 -----END PGP SIGNATURE-----
diff --git a/www-apps/rt/rt-3.8.10.ebuild b/www-apps/rt/rt-3.8.10.ebuild
index 63d14509781c..8c07a09838c7 100644
--- a/www-apps/rt/rt-3.8.10.ebuild
+++ b/www-apps/rt/rt-3.8.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/rt-3.8.10.ebuild,v 1.3 2011/10/04 17:56:21 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/rt-3.8.10.ebuild,v 1.4 2011/10/05 11:17:04 flameeyes Exp $
 
 inherit webapp eutils depend.apache confutils
 
@@ -150,24 +150,35 @@ src_unpack() {
 }
 
 src_compile() {
-	local web="apache"
-	use lighttpd && web="lighttpd"
-
-	local dbtype dba
+	local web myconf depsconf
 
 	if use mysql; then
-		dbtype="--with-db-type=mysql"
-		dba="--with-db-dba=root"
+		myconf+=" --with-db-type=mysql --with-db-dba=root"
+		depsconf+=" --with-mysql"
 	fi
 	if use postgres;then
-		dbtype="--with-db-type=Pg"
-		dba="--with-db-dba=postgres"
+		myconf+=" --with-db-type=Pg --with-db-dba=postgres"
+		depsconf+=" --with-postgresql"
 	fi
 	if use postgres && use mysql; then
 		ewarn "Both mysql and postgres USE flags enabled, default is mysql."
 		ewarn "You can set the default value in RT_SiteConfig before DB init."
-		dbtype="--with-db-type=mysql"
-		dba="--with-db-dba=root"
+		myconf+=" --with-db-type=mysql --with-db-dba=root"
+		depsconf+=" --with-mysql"
+	fi
+
+	if use fastcgi ; then
+		myconf+=" --with-web-handler=fastcgi"
+		web="apache"
+		depsconf+=" --with-fastcgi"
+	elif use lighttpd ; then
+		myconf+=" --with-web-handler=fastcgi"
+		web="lighttpd"
+		depsconf+=" --with-fastcgi"
+	else
+		myconf+=" --with-web-handler=modperl2"
+		web="apache"
+		depsconf+=" --with-modperl2"
 	fi
 
 	./configure --enable-layout=Gentoo \
@@ -177,20 +188,10 @@ src_compile() {
 		--with-rt-group=rt \
 		--with-web-user=${web} \
 		--with-web-group=${web} \
-		${dbtype} ${dba}
+		${myconf}
 
 	# check for missing deps and ask to report if something is broken
-	local myconf="--verbose \
-		$(enable_extension_withonly mysql mysql) \
-		$(enable_extension_withonly postgresql postgres) \
-		$(enable_extension_withonly fastcgi fastcgi) \
-		$(enable_extension_withonly fastcgi lighttpd)" \
-
-	if ! use fastcgi && ! use lighttpd; then
-		myconf="${myconf} --with-modperl2"
-	fi
-
-	/usr/bin/perl ./sbin/rt-test-dependencies ${myconf} > "${T}"/t
+	/usr/bin/perl ./sbin/rt-test-dependencies ${depsconf} > "${T}"/t
 	if grep -q "MISSING" "${T}"/t; then
 		ewarn "Missing Perl dependency!"
 		ewarn