Pull in changes from overlay

Package-Manager: portage--svn/cvs/Linux i686

13 files changed, 50 insertions, 40 deletions

diff --git a/kde-base/kig/ChangeLog b/kde-base/kig/ChangeLog
index a34dde224db5..3c599326b960 100644
--- a/kde-base/kig/ChangeLog
+++ b/kde-base/kig/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kig
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kig/ChangeLog,v 1.145 2009/12/10 21:10:53 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kig/ChangeLog,v 1.146 2009/12/23 00:16:09 abcd Exp $
+
+  23 Dec 2009; Jonathan Callen <abcd@gentoo.org> kig-4.3.4.ebuild:
+  Pull in changes from overlay
 
   10 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org> -kig-4.3.1.ebuild:
   Drop KDE SC-4.3.1.
diff --git a/kde-base/kig/kig-4.3.4.ebuild b/kde-base/kig/kig-4.3.4.ebuild
index 4749d10f8c2a..fcc33a1d75d6 100644
--- a/kde-base/kig/kig-4.3.4.ebuild
+++ b/kde-base/kig/kig-4.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kig/kig-4.3.4.ebuild,v 1.1 2009/12/01 10:40:42 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kig/kig-4.3.4.ebuild,v 1.2 2009/12/23 00:16:09 abcd Exp $
 
 EAPI="2"
 
@@ -17,8 +17,9 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 src_configure() {
-	mycmakeargs="${mycmakeargs}
-		$(cmake-utils_use_with kig-scripting BoostPython)"
+	mycmakeargs=(
+		$(cmake-utils_use_with kig-scripting BoostPython)
+	)
 
 	kde4-meta_src_configure
 }
diff --git a/kde-base/kinfocenter/ChangeLog b/kde-base/kinfocenter/ChangeLog
index 505f88f6128c..093781b52f90 100644
--- a/kde-base/kinfocenter/ChangeLog
+++ b/kde-base/kinfocenter/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kinfocenter
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kinfocenter/ChangeLog,v 1.44 2009/12/10 21:14:12 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kinfocenter/ChangeLog,v 1.45 2009/12/23 00:17:09 abcd Exp $
+
+  23 Dec 2009; Jonathan Callen <abcd@gentoo.org> kinfocenter-4.3.4.ebuild:
+  Pull in changes from overlay
 
   10 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org>
   -kinfocenter-4.3.1.ebuild:
diff --git a/kde-base/kinfocenter/kinfocenter-4.3.4.ebuild b/kde-base/kinfocenter/kinfocenter-4.3.4.ebuild
index ed6fb562d8a6..c5a9a0cbdff1 100644
--- a/kde-base/kinfocenter/kinfocenter-4.3.4.ebuild
+++ b/kde-base/kinfocenter/kinfocenter-4.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kinfocenter/kinfocenter-4.3.4.ebuild,v 1.1 2009/12/01 10:41:45 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kinfocenter/kinfocenter-4.3.4.ebuild,v 1.2 2009/12/23 00:17:09 abcd Exp $
 
 EAPI="2"
 
@@ -26,9 +26,10 @@ KMEXTRACTONLY="
 "
 
 src_configure() {
-	mycmakeargs="${mycmakeargs}
+	mycmakeargs=(
 		$(cmake-utils_use_with ieee1394 RAW1394)
-		$(cmake-utils_use_with opengl OpenGL)"
+		$(cmake-utils_use_with opengl OpenGL)
+	)
 
 	kde4-meta_src_configure
 }
diff --git a/kde-base/kleopatra/ChangeLog b/kde-base/kleopatra/ChangeLog
index 1ece19d30356..35c27a46f526 100644
--- a/kde-base/kleopatra/ChangeLog
+++ b/kde-base/kleopatra/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kleopatra
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kleopatra/ChangeLog,v 1.36 2009/12/10 21:20:59 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kleopatra/ChangeLog,v 1.37 2009/12/23 00:18:03 abcd Exp $
+
+  23 Dec 2009; Jonathan Callen <abcd@gentoo.org> kleopatra-4.3.4.ebuild:
+  Pull in changes from overlay
 
   10 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org>
   -kleopatra-4.3.1.ebuild:
diff --git a/kde-base/kleopatra/kleopatra-4.3.4.ebuild b/kde-base/kleopatra/kleopatra-4.3.4.ebuild
index 540ba0be4414..addfd831afcb 100644
--- a/kde-base/kleopatra/kleopatra-4.3.4.ebuild
+++ b/kde-base/kleopatra/kleopatra-4.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kleopatra/kleopatra-4.3.4.ebuild,v 1.1 2009/12/01 10:43:53 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kleopatra/kleopatra-4.3.4.ebuild,v 1.2 2009/12/23 00:18:03 abcd Exp $
 
 EAPI="2"
 
@@ -37,8 +37,9 @@ src_unpack() {
 }
 
 src_configure() {
-	mycmakeargs="${mycmakeargs}
-		-DWITH_QGPGME=ON"
+	mycmakeargs=(
+		-DWITH_QGPGME=ON
+	)
 
 	kde4-meta_src_configure
 }
diff --git a/kde-base/klinkstatus/ChangeLog b/kde-base/klinkstatus/ChangeLog
index 9e0382cc5fb0..00b37a6c5b2c 100644
--- a/kde-base/klinkstatus/ChangeLog
+++ b/kde-base/klinkstatus/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/klinkstatus
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klinkstatus/ChangeLog,v 1.133 2009/12/10 21:24:33 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klinkstatus/ChangeLog,v 1.134 2009/12/23 00:19:06 abcd Exp $
+
+  23 Dec 2009; Jonathan Callen <abcd@gentoo.org> klinkstatus-4.3.4.ebuild:
+  Pull in changes from overlay
 
   10 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org>
   -klinkstatus-4.3.1.ebuild:
diff --git a/kde-base/klinkstatus/klinkstatus-4.3.4.ebuild b/kde-base/klinkstatus/klinkstatus-4.3.4.ebuild
index 2858c8338014..54cea8fa9ef6 100644
--- a/kde-base/klinkstatus/klinkstatus-4.3.4.ebuild
+++ b/kde-base/klinkstatus/klinkstatus-4.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klinkstatus/klinkstatus-4.3.4.ebuild,v 1.1 2009/12/01 10:44:56 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klinkstatus/klinkstatus-4.3.4.ebuild,v 1.2 2009/12/23 00:19:06 abcd Exp $
 
 EAPI="2"
 KMNAME="kdewebdev"
@@ -17,9 +17,10 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 src_configure() {
-	mycmakeargs="${mycmakeargs}
+	mycmakeargs=(
 		-DWITH_KdepimLibs=ON
-		$(cmake-utils_use_with tidy LibTidy)"
+		$(cmake-utils_use_with tidy LibTidy)
+	)
 
 	kde4-meta_src_configure
 }
diff --git a/kde-base/kmail/ChangeLog b/kde-base/kmail/ChangeLog
index 8a7949597d6a..f77b39b74cea 100644
--- a/kde-base/kmail/ChangeLog
+++ b/kde-base/kmail/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kmail
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.191 2009/12/10 23:05:07 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.192 2009/12/23 00:24:00 abcd Exp $
+
+  23 Dec 2009; Jonathan Callen <abcd@gentoo.org> kmail-4.3.4.ebuild:
+  Pull in changes from overlay
 
   10 Dec 2009; Jonathan Callen <abcd@gentoo.org>
   -files/kmail-4.3.1-fix-rename-folder-on-disconnected-IMAP.patch:
diff --git a/kde-base/kmail/kmail-4.3.4.ebuild b/kde-base/kmail/kmail-4.3.4.ebuild
index 548945e6e50c..e301ea7420a0 100644
--- a/kde-base/kmail/kmail-4.3.4.ebuild
+++ b/kde-base/kmail/kmail-4.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.3.4.ebuild,v 1.1 2009/12/01 10:46:22 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.3.4.ebuild,v 1.2 2009/12/23 00:24:00 abcd Exp $
 
 EAPI="2"
 
@@ -40,8 +40,9 @@ KMLOADLIBS="libkdepim"
 PATCHES=( "${FILESDIR}/${PN}-4.1.72-fix.patch" )
 
 src_configure() {
-	mycmakeargs="${mycmakeargs}
-		$(cmake-utils_use_with semantic-desktop Nepomuk)"
+	mycmakeargs=(
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+	)
 
 	kde4-meta_src_configure
 }
@@ -49,8 +50,9 @@ src_configure() {
 src_compile() {
 	# Bug #276377: kontact/ can build before kmail/, causing a dependency not to be built
 	# Upstream as KDE Bug #198807
-	# (setting via MAKEOPTS to trigger a repoman warning)
-	MAKEOPTS="${MAKEOPTS} -j1"
+	# (setting MAKEOPTS to trigger a repoman warning)
+	: || MAKEOPTS="-j1"
+	kde4-meta_src_compile kmail_xml
 	kde4-meta_src_compile
 }
 
diff --git a/kde-base/kmailcvt/ChangeLog b/kde-base/kmailcvt/ChangeLog
index cf8a3f1ba974..a30f8c4ab4f3 100644
--- a/kde-base/kmailcvt/ChangeLog
+++ b/kde-base/kmailcvt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kmailcvt
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmailcvt/ChangeLog,v 1.122 2009/12/10 21:29:14 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmailcvt/ChangeLog,v 1.123 2009/12/23 00:21:36 abcd Exp $
+
+  23 Dec 2009; Jonathan Callen <abcd@gentoo.org> kmailcvt-4.3.4.ebuild:
+  Pull in changes from overlay
 
   10 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org>
   -kmailcvt-4.3.1.ebuild:
diff --git a/kde-base/kmailcvt/kmailcvt-4.3.4.ebuild b/kde-base/kmailcvt/kmailcvt-4.3.4.ebuild
index fe66cab8ee00..bc39a892cc7c 100644
--- a/kde-base/kmailcvt/kmailcvt-4.3.4.ebuild
+++ b/kde-base/kmailcvt/kmailcvt-4.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmailcvt/kmailcvt-4.3.4.ebuild,v 1.1 2009/12/01 10:46:44 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmailcvt/kmailcvt-4.3.4.ebuild,v 1.2 2009/12/23 00:21:36 abcd Exp $
 
 EAPI="2"
 
@@ -11,21 +11,7 @@ DESCRIPTION="KMail Import Filters"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug"
 
-DEPEND="
-	app-crypt/gpgme
-"
-RDEPEND="${DEPEND}
-	app-crypt/gnupg
-"
-
 # xml targets from kmail are being uncommented by kde4-meta.eclass
 KMEXTRACTONLY="
 	kmail/
 "
-
-src_configure() {
-	mycmakeargs="${mycmakeargs}
-		-DWITH_QGpgme=ON"
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kmenuedit/Manifest b/kde-base/kmenuedit/Manifest
index 0ce9813d0c3d..388bfc653adf 100644
--- a/kde-base/kmenuedit/Manifest
+++ b/kde-base/kmenuedit/Manifest
@@ -3,6 +3,6 @@ DIST kdebase-workspace-4.3.3.tar.bz2 62496238 RMD160 48ab90a519c7811e9fe4aa4e77f
 DIST kdebase-workspace-4.3.4.tar.bz2 62517195 RMD160 665b49b9dd03408ef9ec50e7bd5eb50b993d6138 SHA1 5b43447139d22247d5bc2deee8e3a944447f0bbf SHA256 ea12e04eb402f1257b483b541df5d77b885407bd02992bcb496ccd3335b203c3
 EBUILD kmenuedit-3.5.10.ebuild 401 RMD160 7f0ff5c365fe0b0ed74ff39d16f398cba4987049 SHA1 2c751070c4aff97eaae05714bddfc95ae79692c2 SHA256 4e3dc145ca94849e24e69f1bae6f1c0815589e16bbba8283850db86fd534ef5d
 EBUILD kmenuedit-4.3.3.ebuild 710 RMD160 b363380c82877c3aa599f923ad310c858cea4dc0 SHA1 dca346c1556fd89e84fff64c25a5a04202cb5506 SHA256 4a136f2471cdbca3058b2c8f905c2450a8c513cdaaa842402ed294d15ee36c54
-EBUILD kmenuedit-4.3.4.ebuild 714 RMD160 25ed734d4112c13552c6353c80d657d27f0b8f94 SHA1 136af7b5db336f93f3a8120d4696bdba70e83be2 SHA256 0aca6e29be0fdf8ee0144b213e2104a3706e7603ea979ba895b88357f7515792
-MISC ChangeLog 16200 RMD160 1fe186ee63cbbe2ecfb9c28908d768704d7c15a8 SHA1 23223f5fd24db80710dbe8cd0a65e5e1097845a2 SHA256 967db4766543eddb2ffce03e77c0eff18b0b92bc4ed9ad97c5a2fbfc40e549f7
+EBUILD kmenuedit-4.3.4.ebuild 714 RMD160 53af1cad4864fd997dd436e1d4b6533339bdcb5f SHA1 0e42e7abdb42873a95e525455af092b97cb1c7eb SHA256 222de2bf7c4ee70438bbf196575c54e1e06e1738cd8d8c030f9f1a50ef07f3a9
+MISC ChangeLog 16290 RMD160 3701de520ea1c260b0fd766e429a53f906bf2820 SHA1 ec423dbd9b15ea6c5fe890e52b70af25ed1115a0 SHA256 f4dd9c8c6c4b0dd3e502340567afc16a5bff47b7c8688b9e2e5628f5ed081249
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a