Move myconf population in src_compile rather than global scope.

(Portage version: 2.1.1_pre1-r1)

4 files changed, 12 insertions, 9 deletions

diff --git a/kde-base/kaddressbook/ChangeLog b/kde-base/kaddressbook/ChangeLog
index b403b7338ebf..55cd4280ded8 100644
--- a/kde-base/kaddressbook/ChangeLog
+++ b/kde-base/kaddressbook/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kaddressbook
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/ChangeLog,v 1.51 2006/06/01 16:41:58 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/ChangeLog,v 1.52 2006/06/22 12:57:23 flameeyes Exp $
+
+  22 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
+  kaddressbook-3.4.3.ebuild, kaddressbook-3.5.2-r1.ebuild,
+  kaddressbook-3.5.3.ebuild:
+  Move myconf population in src_compile rather than global scope.
 
 *kaddressbook-3.5.3 (01 Jun 2006)
 
diff --git a/kde-base/kaddressbook/kaddressbook-3.4.3.ebuild b/kde-base/kaddressbook/kaddressbook-3.4.3.ebuild
index dc22b333eeca..fedc527dfcdc 100644
--- a/kde-base/kaddressbook/kaddressbook-3.4.3.ebuild
+++ b/kde-base/kaddressbook/kaddressbook-3.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/kaddressbook-3.4.3.ebuild,v 1.8 2006/03/26 16:43:47 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/kaddressbook-3.4.3.ebuild,v 1.9 2006/06/22 12:57:23 flameeyes Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -18,7 +18,6 @@ $(deprange $PV $MAXKDEVER kde-base/kontact)
 gnokii? ( app-mobilephone/gnokii )"
 
 PATCHES="$FILESDIR/configure-fix-kdepim-gnokii-3.4.patch"
-myconf="$myconf $(use_with gnokii)"
 
 KMCOPYLIB="
 	libkdepim libkdepim
@@ -45,6 +44,7 @@ KMEXTRA="
 	kontact/plugins/kaddressbook"
 
 src_compile() {
+	myconf="$myconf $(use_with gnokii)"
 	export DO_NOT_COMPILE="libical" && kde-meta_src_compile myconf configure
 	# generate "ical.h"
 	cd ${S}/libkcal/libical/src/libical && make ical.h
diff --git a/kde-base/kaddressbook/kaddressbook-3.5.2-r1.ebuild b/kde-base/kaddressbook/kaddressbook-3.5.2-r1.ebuild
index 2ae7177f5542..71d8f4274849 100644
--- a/kde-base/kaddressbook/kaddressbook-3.5.2-r1.ebuild
+++ b/kde-base/kaddressbook/kaddressbook-3.5.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/kaddressbook-3.5.2-r1.ebuild,v 1.7 2006/06/01 05:29:24 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/kaddressbook-3.5.2-r1.ebuild,v 1.8 2006/06/22 12:57:23 flameeyes Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -17,8 +17,6 @@ $(deprange 3.5.0 $MAXKDEVER kde-base/libkdenetwork)
 $(deprange $PV $MAXKDEVER kde-base/kontact)
 gnokii? ( app-mobilephone/gnokii )"
 
-myconf="$myconf $(use_with gnokii)"
-
 KMCOPYLIB="
 	libkdepim libkdepim
 	libkcal libkcal
@@ -45,6 +43,7 @@ KMEXTRA="
 
 PATCHES="${FILESDIR}/kaddressbook-3.5.2-addressee-hompage-fix.diff"
 src_compile() {
+	myconf="$myconf $(use_with gnokii)"
 	export DO_NOT_COMPILE="libical" && kde-meta_src_compile myconf configure
 	# generate "ical.h"
 	cd ${S}/libkcal/libical/src/libical && make ical.h
diff --git a/kde-base/kaddressbook/kaddressbook-3.5.3.ebuild b/kde-base/kaddressbook/kaddressbook-3.5.3.ebuild
index 047fed186403..abef7a9a0c9d 100644
--- a/kde-base/kaddressbook/kaddressbook-3.5.3.ebuild
+++ b/kde-base/kaddressbook/kaddressbook-3.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/kaddressbook-3.5.3.ebuild,v 1.1 2006/06/01 16:41:58 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/kaddressbook-3.5.3.ebuild,v 1.2 2006/06/22 12:57:23 flameeyes Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -17,8 +17,6 @@ $(deprange $PV $MAXKDEVER kde-base/libkdenetwork)
 $(deprange $PV $MAXKDEVER kde-base/kontact)
 gnokii? ( app-mobilephone/gnokii )"
 
-myconf="$myconf $(use_with gnokii)"
-
 KMCOPYLIB="
 	libkdepim libkdepim
 	libkcal libkcal
@@ -44,6 +42,7 @@ KMEXTRA="
 	kontact/plugins/kaddressbook"
 
 src_compile() {
+	myconf="$myconf $(use_with gnokii)"
 	export DO_NOT_COMPILE="libical" && kde-meta_src_compile myconf configure
 	# generate "ical.h"
 	cd ${S}/libkcal/libical/src/libical && make ical.h