Move myconf population in src_compile rather than global scope.

Package-Manager: portage-2.1.1_pre1-r1

14 files changed, 77 insertions, 27 deletions

diff --git a/kde-base/kdebase-kioslaves/ChangeLog b/kde-base/kdebase-kioslaves/ChangeLog
index 9ccd270dc277..281a3611602e 100644
--- a/kde-base/kdebase-kioslaves/ChangeLog
+++ b/kde-base/kdebase-kioslaves/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdebase-kioslaves
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.58 2006/06/22 12:43:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.59 2006/06/22 13:36:13 flameeyes Exp $
+
+  22 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
+  kdebase-kioslaves-3.4.3.ebuild:
+  Move myconf population in src_compile rather than global scope.
 
   22 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
   kdebase-kioslaves-3.5.2.ebuild, kdebase-kioslaves-3.5.3.ebuild:
diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.4.3.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.4.3.ebuild
index 554ba3462059..556287a675ba 100644
--- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.4.3.ebuild
+++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-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/kdebase-kioslaves/kdebase-kioslaves-3.4.3.ebuild,v 1.8 2006/03/26 19:13:39 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.4.3.ebuild,v 1.9 2006/06/22 13:36:13 flameeyes Exp $
 
 KMNAME=kdebase
 KMMODULE=kioslave
@@ -29,5 +29,7 @@ PATCHES="$PATCHES $FILESDIR/configure-fix-kdebase-openexr.patch"
 # Use the kubuntu patch to allow the kioslave to work with the new hal/dbus
 PATCHES="${PATCHES} ${DISTDIR}/kdebase-3.4.3-kubuntu-hal.patch.gz"
 
-myconf="$myconf `use_with ldap` `use_with samba` `use_with hal` `use_with openexr`"
-
+src_compile() {
+	myconf="$myconf `use_with ldap` `use_with samba` `use_with hal` `use_with openexr`"
+	kde-meta_src_compile
+}
diff --git a/kde-base/kdepim-kioslaves/ChangeLog b/kde-base/kdepim-kioslaves/ChangeLog
index ab8667a6fcb9..5834c7b614cd 100644
--- a/kde-base/kdepim-kioslaves/ChangeLog
+++ b/kde-base/kdepim-kioslaves/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdepim-kioslaves
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kioslaves/ChangeLog,v 1.54 2006/06/01 21:36:12 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kioslaves/ChangeLog,v 1.55 2006/06/22 13:34:41 flameeyes Exp $
+
+  22 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
+  kdepim-kioslaves-3.4.3.ebuild, kdepim-kioslaves-3.5.2-r3.ebuild,
+  kdepim-kioslaves-3.5.3.ebuild:
+  Move myconf population in src_compile rather than global scope.
 
   01 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
   kdepim-kioslaves-3.5.3.ebuild:
diff --git a/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.4.3.ebuild b/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.4.3.ebuild
index c57ae42d9edd..6731eebbb29d 100644
--- a/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.4.3.ebuild
+++ b/kde-base/kdepim-kioslaves/kdepim-kioslaves-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/kdepim-kioslaves/kdepim-kioslaves-3.4.3.ebuild,v 1.8 2006/03/26 18:46:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.4.3.ebuild,v 1.9 2006/06/22 13:34:41 flameeyes Exp $
 
 KMNAME=kdepim
 KMMODULE=kioslaves
@@ -16,9 +16,12 @@ DEPEND="sasl? ( >=dev-libs/cyrus-sasl-2 )
 	$(deprange 3.4.1 $MAXKDEVER kde-base/libkmime)"
 
 PATCHES="$FILESDIR/configure-fix-kdepim-sasl.patch"
-myconf="$myconf $(use_with sasl)"
 
 KMCOPYLIB="libkmime libkmime/"
 KMEXTRACTONLY="libkmime/"
 KMCOMPILEONLY="libemailfunctions"
 
+src_compile() {
+	myconf="$myconf $(use_with sasl)"
+	kde-meta_src_compile
+}
diff --git a/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.5.2-r3.ebuild b/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.5.2-r3.ebuild
index 4f7e0ffc4572..497c187e0d76 100644
--- a/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.5.2-r3.ebuild
+++ b/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.5.2-r3.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/kdepim-kioslaves/kdepim-kioslaves-3.5.2-r3.ebuild,v 1.7 2006/06/01 09:33:50 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.5.2-r3.ebuild,v 1.8 2006/06/22 13:34:41 flameeyes Exp $
 
 KMNAME=kdepim
 KMMODULE=kioslaves
@@ -15,10 +15,13 @@ IUSE="sasl"
 DEPEND="sasl? ( >=dev-libs/cyrus-sasl-2 )
 	$(deprange 3.5.0 $MAXKDEVER kde-base/libkmime)"
 
-myconf="$myconf $(use_with sasl)"
-
 KMCOPYLIB="libkmime libkmime/"
 KMEXTRACTONLY="libkmime/"
 KMCOMPILEONLY="libemailfunctions"
 
 PATCHES="${FILESDIR}/kdepim-kioslaves-3.5.2-fixes-2.diff ${FILESDIR}/imap-dos.diff"
+
+src_compile() {
+	myconf="$myconf $(use_with sasl)"
+	kde-meta_src_compile
+}
diff --git a/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.5.3.ebuild b/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.5.3.ebuild
index bf0b7c347544..cbda929d600d 100644
--- a/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.5.3.ebuild
+++ b/kde-base/kdepim-kioslaves/kdepim-kioslaves-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/kdepim-kioslaves/kdepim-kioslaves-3.5.3.ebuild,v 1.2 2006/06/01 21:36:12 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.5.3.ebuild,v 1.3 2006/06/22 13:34:41 flameeyes Exp $
 
 KMNAME=kdepim
 KMMODULE=kioslaves
@@ -15,8 +15,11 @@ IUSE="sasl"
 DEPEND="sasl? ( >=dev-libs/cyrus-sasl-2 )
 	$(deprange $PV $MAXKDEVER kde-base/libkmime)"
 
-myconf="$myconf $(use_with sasl)"
-
 KMCOPYLIB="libkmime libkmime/"
 KMEXTRACTONLY="libkmime/"
 KMCOMPILEONLY="libemailfunctions"
+
+src_compile() {
+	myconf="$myconf $(use_with sasl)"
+	kde-meta_src_compile
+}
diff --git a/kde-base/kicker-applets/ChangeLog b/kde-base/kicker-applets/ChangeLog
index e6014b0e626b..fd51c88b8091 100644
--- a/kde-base/kicker-applets/ChangeLog
+++ b/kde-base/kicker-applets/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kicker-applets
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker-applets/ChangeLog,v 1.48 2006/06/01 18:38:14 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker-applets/ChangeLog,v 1.49 2006/06/22 13:37:54 flameeyes Exp $
+
+  22 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
+  kicker-applets-3.4.3.ebuild, kicker-applets-3.5.2.ebuild,
+  kicker-applets-3.5.3.ebuild:
+  Move myconf population in src_compile rather than global scope.
 
 *kicker-applets-3.5.3 (01 Jun 2006)
 
diff --git a/kde-base/kicker-applets/kicker-applets-3.4.3.ebuild b/kde-base/kicker-applets/kicker-applets-3.4.3.ebuild
index 9fc9635ac9fd..e3eb03d1156f 100644
--- a/kde-base/kicker-applets/kicker-applets-3.4.3.ebuild
+++ b/kde-base/kicker-applets/kicker-applets-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/kicker-applets/kicker-applets-3.4.3.ebuild,v 1.8 2006/03/27 15:24:12 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker-applets/kicker-applets-3.4.3.ebuild,v 1.9 2006/06/22 13:37:54 flameeyes Exp $
 KMNAME=kdeaddons
 KMNOMODULE=true
 KMEXTRA="kicker-applets doc/kicker-applets"
@@ -18,4 +18,7 @@ $(deprange-dual $PV $MAXKDEVER kde-base/kicker)"
 
 PATCHES="$FILESDIR/configure-fix-kdeaddons-xmms.patch"
 
-myconf="$(use_with xmms)"
+src_compile() {
+	myconf="$(use_with xmms)"
+	kde-meta_src_compile
+}
diff --git a/kde-base/kicker-applets/kicker-applets-3.5.2.ebuild b/kde-base/kicker-applets/kicker-applets-3.5.2.ebuild
index 2d863975608f..6196df90cc63 100644
--- a/kde-base/kicker-applets/kicker-applets-3.5.2.ebuild
+++ b/kde-base/kicker-applets/kicker-applets-3.5.2.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/kicker-applets/kicker-applets-3.5.2.ebuild,v 1.9 2006/06/01 05:38:21 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker-applets/kicker-applets-3.5.2.ebuild,v 1.10 2006/06/22 13:37:54 flameeyes Exp $
 KMNAME=kdeaddons
 KMNOMODULE=true
 KMEXTRA="kicker-applets doc/kicker-applets"
@@ -14,4 +14,7 @@ IUSE="xmms"
 DEPEND="xmms? ( media-sound/xmms )
 $(deprange-dual $PV $MAXKDEVER kde-base/kicker)"
 
-myconf="$(use_with xmms)"
+src_compile() {
+	myconf="$(use_with xmms)"
+	kde-meta_src_compile
+}
diff --git a/kde-base/kicker-applets/kicker-applets-3.5.3.ebuild b/kde-base/kicker-applets/kicker-applets-3.5.3.ebuild
index 91e56cd89ed3..0d679b3f1492 100644
--- a/kde-base/kicker-applets/kicker-applets-3.5.3.ebuild
+++ b/kde-base/kicker-applets/kicker-applets-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/kicker-applets/kicker-applets-3.5.3.ebuild,v 1.1 2006/06/01 18:38:14 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker-applets/kicker-applets-3.5.3.ebuild,v 1.2 2006/06/22 13:37:54 flameeyes Exp $
 KMNAME=kdeaddons
 KMNOMODULE=true
 KMEXTRA="kicker-applets doc/kicker-applets"
@@ -14,4 +14,7 @@ IUSE="xmms"
 DEPEND="xmms? ( media-sound/xmms )
 $(deprange-dual $PV $MAXKDEVER kde-base/kicker)"
 
-myconf="$(use_with xmms)"
+src_compile() {
+	myconf="$(use_with xmms)"
+	kde-meta_src_compile
+}
diff --git a/kde-base/ksayit/ChangeLog b/kde-base/ksayit/ChangeLog
index 1fdcfe1318e1..87cecfaf4542 100644
--- a/kde-base/ksayit/ChangeLog
+++ b/kde-base/ksayit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/ksayit
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksayit/ChangeLog,v 1.52 2006/06/01 19:47:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksayit/ChangeLog,v 1.53 2006/06/22 13:32:27 flameeyes Exp $
+
+  22 Jun 2006; Diego Pettenò <flameeyes@gentoo.org> ksayit-3.4.3-r1.ebuild,
+  ksayit-3.5.2.ebuild, ksayit-3.5.3.ebuild:
+  Move myconf population in src_compile rather than global scope.
 
 *ksayit-3.5.3 (01 Jun 2006)
 
diff --git a/kde-base/ksayit/ksayit-3.4.3-r1.ebuild b/kde-base/ksayit/ksayit-3.4.3-r1.ebuild
index 9ef289899731..a773af662a3f 100644
--- a/kde-base/ksayit/ksayit-3.4.3-r1.ebuild
+++ b/kde-base/ksayit/ksayit-3.4.3-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/ksayit/ksayit-3.4.3-r1.ebuild,v 1.8 2006/03/27 20:18:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksayit/ksayit-3.4.3-r1.ebuild,v 1.9 2006/06/22 13:32:27 flameeyes Exp $
 KMNAME=kdeaccessibility
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
@@ -12,6 +12,10 @@ IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/kttsd)
 	$(deprange $PV $MAXKDEVER kde-base/arts)
 	$(deprange-dual 3.4.1 $MAXKDEVER kde-base/kdemultimedia-arts)"
-myconf="--enable-ksayit-audio-plugins"
 
 PATCHES="${FILESDIR}/${P}-pointer.patch"
+
+src_compile() {
+	myconf="--enable-ksayit-audio-plugins"
+	kde-meta_src_compile
+}
diff --git a/kde-base/ksayit/ksayit-3.5.2.ebuild b/kde-base/ksayit/ksayit-3.5.2.ebuild
index a2e8d6d9f7f3..695612bf09d1 100644
--- a/kde-base/ksayit/ksayit-3.5.2.ebuild
+++ b/kde-base/ksayit/ksayit-3.5.2.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/ksayit/ksayit-3.5.2.ebuild,v 1.8 2006/06/01 07:26:06 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksayit/ksayit-3.5.2.ebuild,v 1.9 2006/06/22 13:32:27 flameeyes Exp $
 KMNAME=kdeaccessibility
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
@@ -12,4 +12,8 @@ IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/kttsd)
 	$(deprange $PV $MAXKDEVER kde-base/arts)
 	$(deprange-dual $PV $MAXKDEVER kde-base/kdemultimedia-arts)"
-myconf="--enable-ksayit-audio-plugins"
+
+src_compile() {
+	myconf="--enable-ksayit-audio-plugins"
+	kde-meta_src_compile
+}
diff --git a/kde-base/ksayit/ksayit-3.5.3.ebuild b/kde-base/ksayit/ksayit-3.5.3.ebuild
index c3b0d4deedd3..64f8e5bf1496 100644
--- a/kde-base/ksayit/ksayit-3.5.3.ebuild
+++ b/kde-base/ksayit/ksayit-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/ksayit/ksayit-3.5.3.ebuild,v 1.1 2006/06/01 19:47:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksayit/ksayit-3.5.3.ebuild,v 1.2 2006/06/22 13:32:27 flameeyes Exp $
 KMNAME=kdeaccessibility
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
@@ -12,4 +12,8 @@ IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/kttsd)
 	$(deprange $PV $MAXKDEVER kde-base/arts)
 	$(deprange-dual $PV $MAXKDEVER kde-base/kdemultimedia-arts)"
-myconf="--enable-ksayit-audio-plugins"
+
+src_compile() {
+	myconf="--enable-ksayit-audio-plugins"
+	kde-meta_src_compile
+}