Merge branch 'kde-git'

Conflicts:
	app-cdr/k3b/Manifest
	app-editors/kile/Manifest
	app-office/akonadi-server/Manifest
	app-office/karbon/Manifest
	app-office/karbon/karbon-2.3.0.ebuild
	app-office/karbon/karbon-9999.ebuild
	app-office/kexi/Manifest
	app-office/kexi/kexi-2.3.0.ebuild
	app-office/kexi/kexi-9999.ebuild
	app-office/koffice-data/Manifest
	app-office/koffice-data/koffice-data-2.3.0.ebuild
	app-office/koffice-data/koffice-data-9999.ebuild
	app-office/koffice-l10n/Manifest
	app-office/koffice-l10n/koffice-l10n-2.3.0.ebuild
	app-office/koffice-libs/Manifest
	app-office/koffice-libs/koffice-libs-2.3.0.ebuild
	app-office/koffice-libs/koffice-libs-9999.ebuild
	app-office/koffice-meta/Manifest
	app-office/koffice-meta/koffice-meta-2.3.0.ebuild
	app-office/koffice-meta/koffice-meta-9999.ebuild
	app-office/kplato/Manifest
	app-office/kplato/kplato-2.3.0.ebuild
	app-office/kplato/kplato-9999.ebuild
	app-office/kpresenter/Manifest
	app-office/kpresenter/kpresenter-2.3.0.ebuild
	app-office/kpresenter/kpresenter-9999.ebuild
	app-office/krita/Manifest
	app-office/krita/krita-2.3.0.ebuild
	app-office/krita/krita-9999.ebuild
	app-office/kspread/Manifest
	app-office/kspread/kspread-2.3.0.ebuild
	app-office/kspread/kspread-9999.ebuild
	app-office/kword/Manifest
	app-office/kword/kword-2.3.0.ebuild
	app-office/kword/kword-9999.ebuild
	app-office/scribus/Manifest
	app-office/scribus/scribus-9999.ebuild
	dev-libs/libindicate/Manifest
	dev-libs/libindicate/libindicate-0.4.4.ebuild
	dev-libs/soprano/Manifest
	eclass/kde4-functions.eclass
	kde-base/activitymanager/Manifest
	kde-base/akonadiconsole/Manifest
	kde-base/akregator/Manifest
	kde-base/amor/Manifest
	kde-base/ark/Manifest
	kde-base/attica/Manifest
	kde-base/blinken/Manifest
	kde-base/blogilo/Manifest
	kde-base/bomber/Manifest
	kde-base/bovo/Manifest
	kde-base/cantor/Manifest
	kde-base/cervisia/Manifest
	kde-base/dolphin-plugins/Manifest
	kde-base/dolphin-plugins/dolphin-plugins-4.5.5.ebuild
	kde-base/dolphin-plugins/dolphin-plugins-4.6.0.ebuild
	kde-base/dolphin/Manifest
	kde-base/dragonplayer/Manifest
	kde-base/drkonqi/Manifest
	kde-base/ffmpegthumbs/Manifest
	kde-base/filelight/Manifest
	kde-base/freespacenotifier/Manifest
	kde-base/granatier/Manifest
	kde-base/gwenview/Manifest
	kde-base/jovie/Manifest
	kde-base/juk/Manifest
	kde-base/kabcclient/Manifest
	kde-base/kaccessible/Manifest
	kde-base/kaddressbook/Manifest
	kde-base/kajongg/Manifest
	kde-base/kalarm/Manifest
	kde-base/kalgebra/Manifest
	kde-base/kalzium/Manifest
	kde-base/kamera/Manifest
	kde-base/kanagram/Manifest
	kde-base/kapman/Manifest
	kde-base/kapptemplate/Manifest
	kde-base/kate/Manifest
	kde-base/katomic/Manifest
	kde-base/kbattleship/Manifest
	kde-base/kblackbox/Manifest
	kde-base/kblocks/Manifest
	kde-base/kbounce/Manifest
	kde-base/kbreakout/Manifest
	kde-base/kbruch/Manifest
	kde-base/kbugbuster/Manifest
	kde-base/kbugbuster/kbugbuster-4.5.5.ebuild
	kde-base/kcachegrind/Manifest
	kde-base/kcalc/Manifest
	kde-base/kcharselect/Manifest
	kde-base/kcheckpass/Manifest
	kde-base/kcminit/Manifest
	kde-base/kcmshell/Manifest
	kde-base/kcolorchooser/Manifest
	kde-base/kcontrol/Manifest
	kde-base/kcron/Manifest
	kde-base/kde-env/Manifest
	kde-base/kde-l10n/Manifest
	kde-base/kde-meta/Manifest
	kde-base/kdeaccessibility-colorschemes/Manifest
	kde-base/kdeaccessibility-iconthemes/Manifest
	kde-base/kdeaccessibility-meta/Manifest
	kde-base/kdeaccounts-plugin/Manifest
	kde-base/kdeadmin-meta/Manifest
	kde-base/kdeartwork-colorschemes/Manifest
	kde-base/kdeartwork-desktopthemes/Manifest
	kde-base/kdeartwork-emoticons/Manifest
	kde-base/kdeartwork-iconthemes/Manifest
	kde-base/kdeartwork-kscreensaver/Manifest
	kde-base/kdeartwork-meta/Manifest
	kde-base/kdeartwork-sounds/Manifest
	kde-base/kdeartwork-styles/Manifest
	kde-base/kdeartwork-wallpapers/Manifest
	kde-base/kdeartwork-weatherwallpapers/Manifest
	kde-base/kdebase-cursors/Manifest
	kde-base/kdebase-data/Manifest
	kde-base/kdebase-desktoptheme/Manifest
	kde-base/kdebase-kioslaves/Manifest
	kde-base/kdebase-menu-icons/Manifest
	kde-base/kdebase-menu/Manifest
	kde-base/kdebase-meta/Manifest
	kde-base/kdebase-runtime-meta/Manifest
	kde-base/kdebase-startkde/Manifest
	kde-base/kdebase-wallpapers/Manifest
	kde-base/kdebindings-csharp/Manifest
	kde-base/kdebindings-meta/Manifest
	kde-base/kdebindings-perl/Manifest
	kde-base/kdebindings-ruby/Manifest
	kde-base/kdebindings-ruby/kdebindings-ruby-4.5.5.ebuild
	kde-base/kdebindings-ruby/kdebindings-ruby-4.6.0.ebuild
	kde-base/kdebindings-ruby/kdebindings-ruby-4.6.9999.ebuild
	kde-base/kdebindings-ruby/kdebindings-ruby-9999.ebuild
	kde-base/kdebugdialog/Manifest
	kde-base/kdeedu-meta/Manifest
	kde-base/kdegames-meta/Manifest
	kde-base/kdegraphics-meta/Manifest
	kde-base/kdegraphics-strigi-analyzer/Manifest
	kde-base/kdelibs/Manifest
	kde-base/kdemultimedia-kioslaves/Manifest
	kde-base/kdemultimedia-meta/Manifest
	kde-base/kdenetwork-filesharing/Manifest
	kde-base/kdenetwork-meta/Manifest
	kde-base/kdepasswd/Manifest
	kde-base/kdepim-common-libs/Manifest
	kde-base/kdepim-icons/Manifest
	kde-base/kdepim-kresources/Manifest
	kde-base/kdepim-meta/Manifest
	kde-base/kdepim-runtime/Manifest
	kde-base/kdepim-strigi-analyzer/Manifest
	kde-base/kdepim-wizards/Manifest
	kde-base/kdepimlibs/Manifest
	kde-base/kdeplasma-addons/Manifest
	kde-base/kdesdk-kioslaves/Manifest
	kde-base/kdesdk-meta/Manifest
	kde-base/kdesdk-misc/Manifest
	kde-base/kdesdk-scripts/Manifest
	kde-base/kdesdk-strigi-analyzer/Manifest
	kde-base/kdesu/Manifest
	kde-base/kdetoys-meta/Manifest
	kde-base/kdeutils-meta/Manifest
	kde-base/kdewebdev-meta/Manifest
	kde-base/kdf/Manifest
	kde-base/kdialog/Manifest
	kde-base/kdiamond/Manifest
	kde-base/kdm/Manifest
	kde-base/kdnssd/Manifest
	kde-base/kdontchangethehostname/Manifest
	kde-base/keditbookmarks/Manifest
	kde-base/keditfiletype/Manifest
	kde-base/kephal/Manifest
	kde-base/kfile/Manifest
	kde-base/kfilereplace/Manifest
	kde-base/kfind/Manifest
	kde-base/kfloppy/Manifest
	kde-base/kfmclient/Manifest
	kde-base/kfourinline/Manifest
	kde-base/kgamma/Manifest
	kde-base/kgeography/Manifest
	kde-base/kget/Manifest
	kde-base/kglobalaccel/Manifest
	kde-base/kgoldrunner/Manifest
	kde-base/kgpg/Manifest
	kde-base/khangman/Manifest
	kde-base/khelpcenter/Manifest
	kde-base/khotkeys/Manifest
	kde-base/kiconfinder/Manifest
	kde-base/kig/Manifest
	kde-base/kigo/Manifest
	kde-base/killbots/Manifest
	kde-base/kimagemapeditor/Manifest
	kde-base/kinfocenter/Manifest
	kde-base/kioclient/Manifest
	kde-base/kiriki/Manifest
	kde-base/kiten/Manifest
	kde-base/kjots/Manifest
	kde-base/kjumpingcube/Manifest
	kde-base/kleopatra/Manifest
	kde-base/klettres/Manifest
	kde-base/klickety/Manifest
	kde-base/klines/Manifest
	kde-base/klinkstatus/Manifest
	kde-base/klipper/Manifest
	kde-base/kmag/Manifest
	kde-base/kmahjongg/Manifest
	kde-base/kmail/Manifest
	kde-base/kmail/kmail-4.4.9999.ebuild
	kde-base/kmail/kmail-4.6.9999.ebuild
	kde-base/kmail/kmail-9999.ebuild
	kde-base/kmenuedit/Manifest
	kde-base/kmimetypefinder/Manifest
	kde-base/kmines/Manifest
	kde-base/kmix/Manifest
	kde-base/kmousetool/Manifest
	kde-base/kmouth/Manifest
	kde-base/kmplot/Manifest
	kde-base/knetattach/Manifest
	kde-base/knetwalk/Manifest
	kde-base/knetworkconf/Manifest
	kde-base/knetworkconf/knetworkconf-4.5.5.ebuild
	kde-base/knewstuff/Manifest
	kde-base/knode/Manifest
	kde-base/knotes/Manifest
	kde-base/knotify/Manifest
	kde-base/kolf/Manifest
	kde-base/kollision/Manifest
	kde-base/kolourpaint/Manifest
	kde-base/kommander/Manifest
	kde-base/kompare/Manifest
	kde-base/konqueror/Manifest
	kde-base/konquest/Manifest
	kde-base/konsole/Manifest
	kde-base/konsolekalendar/Manifest
	kde-base/kontact/Manifest
	kde-base/kopete/Manifest
	kde-base/korganizer/Manifest
	kde-base/kpasswdserver/Manifest
	kde-base/kpat/Manifest
	kde-base/kppp/Manifest
	kde-base/kquitapp/Manifest
	kde-base/krdc/Manifest
	kde-base/kreadconfig/Manifest
	kde-base/kremotecontrol/Manifest
	kde-base/kreversi/Manifest
	kde-base/krfb/Manifest
	kde-base/krfb/krfb-4.5.5.ebuild
	kde-base/krossjava/Manifest
	kde-base/krosspython/Manifest
	kde-base/kruler/Manifest
	kde-base/krunner/Manifest
	kde-base/ksame/Manifest
	kde-base/ksame/ksame-4.5.5.ebuild
	kde-base/ksaneplugin/Manifest
	kde-base/kscd/Manifest
	kde-base/kscreensaver/Manifest
	kde-base/kshisen/Manifest
	kde-base/ksirk/Manifest
	kde-base/ksmserver/Manifest
	kde-base/ksnapshot/Manifest
	kde-base/ksnapshot/ksnapshot-4.5.5.ebuild
	kde-base/kspaceduel/Manifest
	kde-base/ksplash/Manifest
	kde-base/ksquares/Manifest
	kde-base/kstars/Manifest
	kde-base/kstart/Manifest
	kde-base/kstartperf/Manifest
	kde-base/kstartupconfig/Manifest
	kde-base/kstyles/Manifest
	kde-base/ksudoku/Manifest
	kde-base/ksysguard/Manifest
	kde-base/ksystemlog/Manifest
	kde-base/ksystraycmd/Manifest
	kde-base/kteatime/Manifest
	kde-base/ktimer/Manifest
	kde-base/ktimetracker/Manifest
	kde-base/ktimezoned/Manifest
	kde-base/ktouch/Manifest
	kde-base/ktraderclient/Manifest
	kde-base/ktron/Manifest
	kde-base/ktuberling/Manifest
	kde-base/kturtle/Manifest
	kde-base/ktux/Manifest
	kde-base/kubrick/Manifest
	kde-base/kuiserver/Manifest
	kde-base/kuiviewer/Manifest
	kde-base/kurifilter-plugins/Manifest
	kde-base/kuser/Manifest
	kde-base/kvtml-data/Manifest
	kde-base/kwallet/Manifest
	kde-base/kwalletd/Manifest
	kde-base/kwin/Manifest
	kde-base/kwordquiz/Manifest
	kde-base/kwrite/Manifest
	kde-base/kwrited/Manifest
	kde-base/libkcddb/Manifest
	kde-base/libkcompactdisc/Manifest
	kde-base/libkdcraw/Manifest
	kde-base/libkdeedu/Manifest
	kde-base/libkdegames/Manifest
	kde-base/libkdepim/Manifest
	kde-base/libkdepim/libkdepim-4.4.9999.ebuild
	kde-base/libkexiv2/Manifest
	kde-base/libkipi/Manifest
	kde-base/libkmahjongg/Manifest
	kde-base/libkonq/Manifest
	kde-base/libksane/Manifest
	kde-base/libkworkspace/Manifest
	kde-base/liboxygenstyle/Manifest
	kde-base/libplasmaclock/Manifest
	kde-base/libplasmagenericshell/Manifest
	kde-base/libtaskmanager/Manifest
	kde-base/lokalize/Manifest
	kde-base/lskat/Manifest
	kde-base/marble/Manifest
	kde-base/mplayerthumbs/Manifest
	kde-base/nepomuk/Manifest
	kde-base/nsplugins/Manifest
	kde-base/okteta/Manifest
	kde-base/okular/Manifest
	kde-base/oxygen-icons/Manifest
	kde-base/palapeli/Manifest
	kde-base/parley/Manifest
	kde-base/phonon-kde/Manifest
	kde-base/plasma-apps/Manifest
	kde-base/plasma-runtime/Manifest
	kde-base/plasma-workspace/Manifest
	kde-base/powerdevil/Manifest
	kde-base/printer-applet/Manifest
	kde-base/pykde4/Manifest
	kde-base/qguiplatformplugin_kde/Manifest
	kde-base/renamedlg-plugins/Manifest
	kde-base/rocs/Manifest
	kde-base/smoke/Manifest
	kde-base/solid-runtime/Manifest
	kde-base/solid/Manifest
	kde-base/step/Manifest
	kde-base/superkaramba/Manifest
	kde-base/svgpart/Manifest
	kde-base/sweeper/Manifest
	kde-base/system-config-printer-kde/Manifest
	kde-base/systemsettings/Manifest
	kde-base/thumbnailers/Manifest
	kde-base/umbrello/Manifest
	kde-misc/kdiff3/Manifest
	kde-misc/kdiff3/kdiff3-0.9.95-r1.ebuild
	kde-misc/kdiff3/kdiff3-9999.ebuild
	kde-misc/nightmode/Manifest
	kde-misc/nightmode/nightmode-0.2.ebuild
	kde-misc/plasma-mail/Manifest
	kde-misc/plasma-mail/plasma-mail-0.3.1.ebuild
	media-sound/phonon-gstreamer/Manifest
	media-sound/phonon-gstreamer/phonon-gstreamer-9999.ebuild
	media-sound/phonon-vlc/Manifest
	media-sound/phonon-vlc/phonon-vlc-9999.ebuild
	media-sound/phonon-xine/Manifest
	media-sound/phonon-xine/phonon-xine-9999.ebuild
	media-sound/phonon/Manifest
	media-sound/phonon/phonon-9999.ebuild
	net-im/choqok/Manifest
	net-libs/libgcal/Manifest
	net-libs/libgcal/libgcal-0.9.6.ebuild
	net-libs/libktorrent/Manifest
	net-misc/ksshaskpass/Manifest
	net-misc/ksshaskpass/ksshaskpass-0.5.3.ebuild
	net-p2p/ktorrent/Manifest
	sys-auth/polkit-kde-agent/Manifest
	x11-themes/oxygen-gtk/Manifest

Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>

22 files changed, 34 insertions, 72 deletions

diff --git a/dev-util/automoc/Manifest b/dev-util/automoc/Manifest
index 9e63ae3bc68..10c029a37f1 100644
--- a/dev-util/automoc/Manifest
+++ b/dev-util/automoc/Manifest
@@ -1,22 +1,2 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-EBUILD automoc-9999.ebuild 463 RMD160 38e82ac21ec06d31fa373c7bece82a4794e59056 SHA1 6bdcfd340512accbaf7275713c96a8050c257ebf SHA256 892fda1197c13c2cbd5edf5b852eefb0ff890fa9c338898e3cf54e9720d9e70d
+EBUILD automoc-9999.ebuild 463 RMD160 147e56f54618d9973105e04f21b84ca06149cdd3 SHA1 efb4783dece2ef2cd5789ec56d444123df749f77 SHA256 afbf6a56abc058aff9e6ef57f6d32da95b4a1f51b8cab380d9741ab4416654f4
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iQIcBAEBCAAGBQJNADY3AAoJELHSF2kinlg4rQMP/2naDVMr0ymuRVNfS2Rc8jVB
-QOuWbkDIqWP3XmY2hJNRu49czKE7DWK3lUHtNTeqUdNZDQLDrDGGxJNCrWWCsVQd
-xO7QG7al30VNH9RgvZEo/AyYyb/nEc5MRjZiLoQ4j7VKz1tzmgpx/6SQfFbRQOcu
-X5v9czkhMGMFh2moYtaCWV/r/VKzplKgkXbWF30Lo/1vkvLAE5ywuriM5XeVLwyo
-30CM91R7V2u4gprkfTXHHWibM7YyCX/gTpuRTKEAFwcBVB+zgpQsdW/yFQElvdyk
-9toMR8JAZZcRFuUzy1m/FY0J92RmCzzBBqlg8yBx90pdnlw/Qd3P3SkkK4AfxSfO
-2qd2Mc/70RRvwu6NlvusaElQ932HVUJn/17PGZ9MyeebVJct00RYH1dpHAD9CoAa
-oxqA4FnzLMzkiD6z3OUr7OQtl1PKUYJZIWxuxAaIrIWCgZe91kPnfwVQmq6ucRjb
-ZeNdRxkvBaxs1HKqf+aGeGIqnOQRZMFKPNk7xanMZald1DBhCYmrHcowyrQyiA5f
-JUIHuTchSR43wqfg2adZM0nJWUXa0+idmfVAp7Bb+B8CnLcHl68Cr+BDOsiNbpI5
-FtbVMCkiN5fTJLSrZZUQhS7bq9eIiZnJ+uj80EKsDe7iBb5ABQurqV0VD13kfZuf
-a7M0RrPzGNc9JyjDzkmy
-=ZHo7
------END PGP SIGNATURE-----
diff --git a/dev-util/automoc/automoc-9999.ebuild b/dev-util/automoc/automoc-9999.ebuild
index 3a28d85186d..0161183494a 100644
--- a/dev-util/automoc/automoc-9999.ebuild
+++ b/dev-util/automoc/automoc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
diff --git a/dev-util/cpp-dependency-analyzer/Manifest b/dev-util/cpp-dependency-analyzer/Manifest
index e1ec348e7ee..03f6ff8aeee 100644
--- a/dev-util/cpp-dependency-analyzer/Manifest
+++ b/dev-util/cpp-dependency-analyzer/Manifest
@@ -1,2 +1,2 @@
-EBUILD cpp-dependency-analyzer-9999.ebuild 549 RMD160 24b0686376aaa421e70c6e0146e61f924d9d5e38 SHA1 fb408acc3391fec45b238c7c0c2f4dcb67a13d2d SHA256 c50c7213dd83a86e33b2028655622f82fee637a8284a754ab2361652e6e63655
+EBUILD cpp-dependency-analyzer-9999.ebuild 549 RMD160 3f7e1fd1c5c6d1bf64b4989dea1941338e9587ab SHA1 75109a022cf01ef0f00c6a54484b77129cfb8f72 SHA256 afc80c755f15c3f43828052ae9ccd487d877f629c2b0b3360b4ac3f7dbcae40d
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
diff --git a/dev-util/cpp-dependency-analyzer/cpp-dependency-analyzer-9999.ebuild b/dev-util/cpp-dependency-analyzer/cpp-dependency-analyzer-9999.ebuild
index 6e1c7ffa612..673d9b7d464 100644
--- a/dev-util/cpp-dependency-analyzer/cpp-dependency-analyzer-9999.ebuild
+++ b/dev-util/cpp-dependency-analyzer/cpp-dependency-analyzer-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="3"
 
 inherit git cmake-utils
 
diff --git a/dev-util/kdevelop-extra-plugins/Manifest b/dev-util/kdevelop-extra-plugins/Manifest
index b97e960fecf..fc7f2947b97 100644
--- a/dev-util/kdevelop-extra-plugins/Manifest
+++ b/dev-util/kdevelop-extra-plugins/Manifest
@@ -1,2 +1,2 @@
-EBUILD kdevelop-extra-plugins-9999.ebuild 1766 RMD160 e8a165d3eb2b49b98918a6e4f17801ac81c8c8b8 SHA1 2e694330ce18a113bffbeccccfa4bb3b3df630a4 SHA256 2be3ea70e3262a9f5dc27be4e431a74230a55fe4f2cc2fe8553e8ff3c0a2a970
+EBUILD kdevelop-extra-plugins-9999.ebuild 1766 RMD160 2bdc465481e40582bd1504d6171d6ae4745e1593 SHA1 4022f7fda449293c3ddd2f03013ae76afec91702 SHA256 4e70a66be8f9fd68683aee01ff2730ecc7bae3aa2d3ed5fbad1a994b8d27a77a
 MISC metadata.xml 1224 RMD160 d940e4bc8e8ec27df91ef1756862959221ad7b90 SHA1 e1e36e8f2aef579bf960e2b7fb84318e11b50cd1 SHA256 220f5e6cf07247dcbcff1742d87553d733a2ac8de704c16a927d9b8e7d0dca11
diff --git a/dev-util/kdevelop-extra-plugins/kdevelop-extra-plugins-9999.ebuild b/dev-util/kdevelop-extra-plugins/kdevelop-extra-plugins-9999.ebuild
index 15749ad2f96..808f577e21f 100644
--- a/dev-util/kdevelop-extra-plugins/kdevelop-extra-plugins-9999.ebuild
+++ b/dev-util/kdevelop-extra-plugins/kdevelop-extra-plugins-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="3"
 
 KMNAME="playground/devtools"
 KMMODULE="kdevelop4-extra-plugins"
diff --git a/dev-util/kdevelop-mercurial/Manifest b/dev-util/kdevelop-mercurial/Manifest
index 3fce4862aca..a6cbae71211 100644
--- a/dev-util/kdevelop-mercurial/Manifest
+++ b/dev-util/kdevelop-mercurial/Manifest
@@ -1,2 +1,2 @@
-EBUILD kdevelop-mercurial-9999.ebuild 571 RMD160 f86267c0d27a92b4e57156a60111a4ac755bfdb3 SHA1 3634aa94534e96b2429436b15e8701c4b49e6080 SHA256 8570fdb36ecc12ea66bda09ee5dffc658ddc5e1041fe86355306cd20fd947057
+EBUILD kdevelop-mercurial-9999.ebuild 571 RMD160 dc1b8e29f24c697d43e6d21d86569ff9aed8c4de SHA1 9b6aa59832072757f79fbacc3b235173a7630afc SHA256 48f9b26a397afb1e4ddc657a88e5d667017cf21ba920bb143dfcf3e9f478b4d1
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
diff --git a/dev-util/kdevelop-mercurial/kdevelop-mercurial-9999.ebuild b/dev-util/kdevelop-mercurial/kdevelop-mercurial-9999.ebuild
index a01736ea821..e7113b3209d 100644
--- a/dev-util/kdevelop-mercurial/kdevelop-mercurial-9999.ebuild
+++ b/dev-util/kdevelop-mercurial/kdevelop-mercurial-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="3"
 
 KMNAME="kdevelop"
 KDEVPLATFORM_VERSION="1.0.2"
diff --git a/dev-util/kdevelop-pg-qt/Manifest b/dev-util/kdevelop-pg-qt/Manifest
index 17ecacaf61d..77cab75b075 100644
--- a/dev-util/kdevelop-pg-qt/Manifest
+++ b/dev-util/kdevelop-pg-qt/Manifest
@@ -1,22 +1,2 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-EBUILD kdevelop-pg-qt-9999.ebuild 464 RMD160 70aae48e8cb3f2ef41287294c9ed9da3f6542cdd SHA1 74038c022a7ac2af2e7c4b3fb498a701af4aa4cb SHA256 0b76af8207f05325f9820188a5696daa86ea7b36bf73b74272cbbc27d0e2c546
+EBUILD kdevelop-pg-qt-9999.ebuild 464 RMD160 97a13abfff420dfa9e30c0f4c9632e52d128545d SHA1 3e94693ee292d2afce379ca0a1201af8931b0a1e SHA256 c2b96c2ca7f16d4ef4e94770afdd126e482ed65c62e82967c32550c9eab66994
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iQIcBAEBCAAGBQJNADY0AAoJELHSF2kinlg4hcMQAJZnN8sVqAi4iMFuNZaPI6K+
-Ikxnttxprfcw1p0LLKDEOBkZZb/mlIwoGyKvgHfelCwthLFNQSqjKn4b8Snua4cR
-6DTAtn/RTdxwo5VWT6sYoS8sMN2W12TvW8jObrHK9GtBexvRNHBoc5EeCeHFhg8e
-gshffVnX2pFhZRHmqiKpt0HUm1c3cPNW7qf5I3Rt2kb4uZhTvz9vAJucuyZlsrhm
-rEWLtLI60Fggq5pLhNtUhsQQ8lDvWVNym7hWrEjWmEnn7+/yeP9DzGBKxF5e7f6x
-jK8SkAciYvJfb9Qput+clCm4aiDolqfmP8FfTjPNlh1L1xCRtjT+FadlGp/8xDo6
-Wpd5K1P+bms266zXzHfoRTpl7PTl5iUnKPErv0oFGSwxW+1eIEapauoEwXvTOsZf
-2BbhVhmsXIe/3wCAy0jkTY0WSyamMFQ3tzWZcl5RgkpUIvGYiMCdOXXD+Gs29Ki9
-tBrzRxJV0dnF324OwbF5f/iaShvRz3RTtHQtWpabuYBgjV2FHB2iY5ct6uFRofuc
-ihaXKOUxO/XWcCZeXtcPV8L0dVXkAy1xLuIO+Ckp9FlMnDWV1gZ9rfweB2qpJWm6
-MLDaKVkWxIY2SAKY5TXVBUn8Nk8L9fNlury7aRg53Zu68C4ME4gfg67yLLZka94h
-g0V80yaVUo+XNBfHXJZa
-=6yW1
------END PGP SIGNATURE-----
diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-9999.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-9999.ebuild
index aafd714a97a..0fd5486581e 100644
--- a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-9999.ebuild
+++ b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="3"
 
 inherit git kde4-base
 
diff --git a/dev-util/kdevelop-php-docs/Manifest b/dev-util/kdevelop-php-docs/Manifest
index 878501ae60c..312a46e54e0 100644
--- a/dev-util/kdevelop-php-docs/Manifest
+++ b/dev-util/kdevelop-php-docs/Manifest
@@ -1,2 +1,2 @@
-EBUILD kdevelop-php-docs-9999.ebuild 344 RMD160 ade9871499c0abb96e5525a804f7e466d086523d SHA1 90d7617ce74bd0e5fe24713f9fa99475dfc6c30a SHA256 3a049258dac87cddb3739ade4e5404c5b26ab0a7feec9b23b8e6e6f0bbf9a25e
+EBUILD kdevelop-php-docs-9999.ebuild 344 RMD160 786859b1973890c371104bbb1651fcc69fefe9f5 SHA1 741949d2d08a31546964ba551e67bfb74f9b8114 SHA256 a51731b9c6197d0d889e15e6e7fa21ec7cc8da8c71c5bf5978df041fe3834985
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
diff --git a/dev-util/kdevelop-php-docs/kdevelop-php-docs-9999.ebuild b/dev-util/kdevelop-php-docs/kdevelop-php-docs-9999.ebuild
index 42a61b158fc..20c98b32fb0 100644
--- a/dev-util/kdevelop-php-docs/kdevelop-php-docs-9999.ebuild
+++ b/dev-util/kdevelop-php-docs/kdevelop-php-docs-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="3"
 
 KMNAME="kdevelop"
 KMMODULE="kdev-php-docs"
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index 79109162e83..93c05100d82 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,2 +1,2 @@
-EBUILD kdevelop-php-9999.ebuild 391 RMD160 430d9ba65497765f66254cd8c27aae1332d53d36 SHA1 423724ac4bdd09362e07d9d718db34d33118a46f SHA256 a27da915116b48d06e563d3d07b4cb8cda593ed286eee005de2389634fc1e4ed
+EBUILD kdevelop-php-9999.ebuild 391 RMD160 b354290d17e932f27de2194e177db48dc26eca65 SHA1 15a905cca386271501f5d97482c06afd85bc205d SHA256 3cdd804a3ce4e26645b263abd6f216ab4d76fdac12fbc79bd512aeba3a970992
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
diff --git a/dev-util/kdevelop-php/kdevelop-php-9999.ebuild b/dev-util/kdevelop-php/kdevelop-php-9999.ebuild
index 3dac41081c3..c0f292e9b73 100644
--- a/dev-util/kdevelop-php/kdevelop-php-9999.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="3"
 
 KMNAME="kdevelop"
 KMMODULE="kdev-php"
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 06bec0801d9..45de1e9a253 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,2 +1,2 @@
-EBUILD kdevelop-9999.ebuild 1334 RMD160 d82903f73c5615f43b232d5da1a495067d78168f SHA1 06c6cc3ea66cbec464fd1aab96e4c1ccf0f723df SHA256 21514c09484c76feaf6fe0a8a7dd408db6b61996e33a692bc99f4089d9e1d1e1
+EBUILD kdevelop-9999.ebuild 1348 RMD160 711622fba619d67bc7afbce5f8550f9b479b89a7 SHA1 8ecf9f721d2a3510ec424a55975843dd193e0399 SHA256 be67fe01e846c434d5c562ec00a1121a2541b482ecf96175312d9b1aeac260eb
 MISC metadata.xml 429 RMD160 19300c79fd5f01e46ccdb57c48e9092f84a99df4 SHA1 c0fa5ba9271542c990a65094391985285fdc17af SHA256 57c402369aa48da3ae4102f7d649da1e3c0bc1ddb38672ae51759cd8490b29f5
diff --git a/dev-util/kdevelop/kdevelop-9999.ebuild b/dev-util/kdevelop/kdevelop-9999.ebuild
index f8af88b0f95..fe18ee6cc07 100644
--- a/dev-util/kdevelop/kdevelop-9999.ebuild
+++ b/dev-util/kdevelop/kdevelop-9999.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="3"
 
 KMNAME="kdevelop"
+KDE_SCM="git"
 inherit kde4-base
 
 DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages."
diff --git a/dev-util/kdevplatform/Manifest b/dev-util/kdevplatform/Manifest
index 785fc9c0120..45d1087e164 100644
--- a/dev-util/kdevplatform/Manifest
+++ b/dev-util/kdevplatform/Manifest
@@ -1,2 +1,2 @@
-EBUILD kdevplatform-9999.ebuild 1402 RMD160 d57164c56c3b3f9b6fdb58a2725a1fe305a269a2 SHA1 22f49aeaa7311628359b0eb351bf9ecbd0c0fbcb SHA256 8fff3a3de03df6d26a7eaf6fb3267586f2c585cce093006aa3c3109e50999281
+EBUILD kdevplatform-9999.ebuild 1416 RMD160 0f24c88985c419bdc793b51071f128a4d0d67e5d SHA1 755b4e82087e03615611d4be66c2cc84f5f49d45 SHA256 194a650d3b7ec928576b783153a0a323ba2d099ce5e72c53aea494b83b7792c0
 MISC metadata.xml 289 RMD160 5df6ca559e1302043ad23456aedb09fcacd7acd7 SHA1 9f26aa927ee5c2209fcb3684bf00023c5aa4dada SHA256 88e0f5b61bd48a62ee51897ec303a9098be25268904c2d63185531ee1a412b3b
diff --git a/dev-util/kdevplatform/kdevplatform-9999.ebuild b/dev-util/kdevplatform/kdevplatform-9999.ebuild
index 0c1036de2e9..9e5ccea3ed3 100644
--- a/dev-util/kdevplatform/kdevplatform-9999.ebuild
+++ b/dev-util/kdevplatform/kdevplatform-9999.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="3"
 
 KMNAME="kdevelop"
+KDE_SCM="git"
 inherit kde4-base
 
 DESCRIPTION="KDE development support libraries and apps"
diff --git a/dev-util/krazy2/Manifest b/dev-util/krazy2/Manifest
index 8886e48dc37..08332234d03 100644
--- a/dev-util/krazy2/Manifest
+++ b/dev-util/krazy2/Manifest
@@ -1,2 +1,2 @@
-EBUILD krazy2-9999.ebuild 1310 RMD160 97f1fa249fbf086b463791177b26e5d84e4b3bc9 SHA1 96f3d8b5955fb71727ebcee47cc69571a5ffb62e SHA256 c6e07ad76573273d2f3f3ee2d1b60a619bd40c3e3ecc42f4bcd26dd108742fc2
+EBUILD krazy2-9999.ebuild 1310 RMD160 cdc2db816d3d9e90e9a16c1363c7c3a471ed4752 SHA1 45d1cc01f5e50f4a63fa50cb9a0c14c214181ac4 SHA256 519e5eafdde59a7e570624c7e47d035ef2d2c150298a38135017a13271e18e7d
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
diff --git a/dev-util/krazy2/krazy2-9999.ebuild b/dev-util/krazy2/krazy2-9999.ebuild
index 4a4391d1638..9427a381b40 100644
--- a/dev-util/krazy2/krazy2-9999.ebuild
+++ b/dev-util/krazy2/krazy2-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="3"
 
 inherit git perl-module qt4 cmake-utils
 
diff --git a/dev-util/kxsldbg/Manifest b/dev-util/kxsldbg/Manifest
index ce5087bcdd2..e2fec311dc2 100644
--- a/dev-util/kxsldbg/Manifest
+++ b/dev-util/kxsldbg/Manifest
@@ -1,2 +1,2 @@
-EBUILD kxsldbg-9999.ebuild 593 RMD160 9305925ddf1393dce3ebd8a689d982bd984fabe6 SHA1 038fb6215b1d66c69500ba27b4bf6c4bc8bfbc7b SHA256 e65875f5d7f76155d3697f5e55f8fb811571350f9ccc62979c75992b4e1ac739
+EBUILD kxsldbg-9999.ebuild 593 RMD160 ff0a19013e3d6901329d97a8f3b86d32b7fff77a SHA1 599faf662a47e4b2438549b3afd000d554f5a4bf SHA256 682a6f3930ba81f171b7bfd92c46aa72667e19db3129b96c615b8fda571e11bf
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/dev-util/kxsldbg/kxsldbg-9999.ebuild b/dev-util/kxsldbg/kxsldbg-9999.ebuild
index 0831bf45dee..c370f67e626 100644
--- a/dev-util/kxsldbg/kxsldbg-9999.ebuild
+++ b/dev-util/kxsldbg/kxsldbg-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="3"
 
 KMNAME="extragear/sdk"
 inherit kde4-meta