Move addpredict for /etc/krb5.conf from src_install() to src_compile().

4 files changed, 16 insertions, 8 deletions

diff --git a/eclass/php-sapi.eclass b/eclass/php-sapi.eclass
index 84ea8617e88c..52fc4b155d0a 100644
--- a/eclass/php-sapi.eclass
+++ b/eclass/php-sapi.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-sapi.eclass,v 1.83 2005/07/17 16:01:24 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-sapi.eclass,v 1.84 2005/07/23 05:25:50 sebastian Exp $
 # Author: Robin H. Johnson <robbat2@gentoo.org>
 
 inherit eutils flag-o-matic multilib libtool
@@ -512,6 +512,9 @@ php-sapi_src_compile() {
 	replace-flags "-march=k6-2" "-march=i586"
 	replace-flags "-march=k6" "-march=i586"
 
+	# Bug 98694
+	addpredict /etc/krb5.conf
+
 	if [ -z "${PHP_SKIP_CONFIGURE}" ]; then
 		LDFLAGS="${LDFLAGS} -L/usr/${libdir}" LIBS="${LIBS}" econf \
 		${myconf} || die "bad ./configure, please include ${MY_P}/config.log in any bug reports."
@@ -528,7 +531,6 @@ php-sapi_src_install() {
 
 	addpredict /usr/share/snmp/mibs/.index
 	addpredict /var/lib/net-snmp/
-	addpredict /etc/krb5.conf
 	dodir /usr/bin
 	dodir /usr/${libdir}/php
 	dodir /usr/include/php
diff --git a/eclass/php5-sapi-r1.eclass b/eclass/php5-sapi-r1.eclass
index ec1b420face6..fa1b73697d28 100644
--- a/eclass/php5-sapi-r1.eclass
+++ b/eclass/php5-sapi-r1.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi-r1.eclass,v 1.18 2005/07/17 16:01:24 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi-r1.eclass,v 1.19 2005/07/23 05:25:50 sebastian Exp $
 #
 # eclass/php5-sapi-r1.eclass
 #               Eclass for building different php5 SAPI instances
@@ -434,6 +434,9 @@ php5-sapi-r1_src_compile() {
 		my_conf="${my_conf} --disable-cli"
 	fi
 
+	# Bug 98694
+	addpredict /etc/krb5.conf
+
 	# all done
 
 	econf ${my_conf} || die "configure failed"
@@ -442,7 +445,6 @@ php5-sapi-r1_src_compile() {
 
 php5-sapi-r1_src_install() {
 	addpredict /usr/share/snmp/mibs/.index
-	addpredict /etc/krb5.conf
 
 	useq sharedext && PHP_INSTALLTARGETS="${PHP_INSTALLTARGETS} install-modules"
 	make INSTALL_ROOT=${D} $PHP_INSTALLTARGETS || die "install failed"
diff --git a/eclass/php5-sapi-r2.eclass b/eclass/php5-sapi-r2.eclass
index 34dcda806cf1..ee9a807a8913 100644
--- a/eclass/php5-sapi-r2.eclass
+++ b/eclass/php5-sapi-r2.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi-r2.eclass,v 1.33 2005/07/17 16:01:24 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi-r2.eclass,v 1.34 2005/07/23 05:25:50 sebastian Exp $
 #
 # eclass/php5-sapi-r2.eclass
 #               Eclass for building different php5 SAPI instances
@@ -481,6 +481,9 @@ php5-sapi-r2_src_compile() {
 		my_conf="${my_conf} --with-pic"
 	fi
 
+	# Bug 98694
+	addpredict /etc/krb5.conf
+
 	# all done
 
 	econf ${my_conf} || die "configure failed"
@@ -490,7 +493,6 @@ php5-sapi-r2_src_compile() {
 php5-sapi-r2_src_install() {
 	cd ${PHP_S}
 	addpredict /usr/share/snmp/mibs/.index
-	addpredict /etc/krb5.conf
 
 	useq sharedext && PHP_INSTALLTARGETS="${PHP_INSTALLTARGETS} install-modules"
 	make INSTALL_ROOT=${D} $PHP_INSTALLTARGETS || die "install failed"
diff --git a/eclass/php5-sapi-r3.eclass b/eclass/php5-sapi-r3.eclass
index 398420c6f04c..a0d17a1f1f95 100644
--- a/eclass/php5-sapi-r3.eclass
+++ b/eclass/php5-sapi-r3.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi-r3.eclass,v 1.20 2005/07/17 16:01:24 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi-r3.eclass,v 1.21 2005/07/23 05:25:50 sebastian Exp $
 #
 # ########################################################################
 #
@@ -483,6 +483,9 @@ php5-sapi-r3_src_compile() {
 		my_conf="${my_conf} --disable-cli"
 	fi
 
+	# Bug 98694
+	addpredict /etc/krb5.conf
+
 	# all done
 
 	econf ${my_conf} || die "configure failed"
@@ -492,7 +495,6 @@ php5-sapi-r3_src_compile() {
 php5-sapi-r3_src_install() {
 	cd ${PHP_S}
 	addpredict /usr/share/snmp/mibs/.index
-	addpredict /etc/krb5.conf
 
 	useq sharedext && PHP_INSTALLTARGETS="${PHP_INSTALLTARGETS} install-modules"
 	make INSTALL_ROOT=${D} $PHP_INSTALLTARGETS || die "install failed"