[gentoo-commits] proj/kde:master commit in: dev-libs/soprano/, net-p2p/ktorrent/, kde-misc/kwebkitpart/, ...

[Jonathan Callen]

commit:     7dab287bd58a6d853388df8d42938db4318deb65
Author:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 28 01:52:36 2011 +0000
Commit:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
CommitDate: Thu Apr 28 01:52:36 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=7dab287b

Use EAPI=4 when possible, massive cleanup

(Portage version: 2.2.0_alpha30/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 229E5838)

---
 app-backup/timevault/timevault-9999.ebuild         |    4 +-
 app-cdr/k3b/k3b-9999.ebuild                        |    2 +-
 app-cdr/k9copy/k9copy-9999.ebuild                  |    2 +-
 app-editors/kile/kile-9999.ebuild                  |    2 +-
 app-misc/strigi/strigi-9999.ebuild                 |    2 +-
 .../akonadi-server/akonadi-server-9999.ebuild      |    2 +-
 app-office/kmymoney/kmymoney-9999.ebuild           |    2 +-
 app-office/skrooge/skrooge-9999.ebuild             |    2 +-
 app-pda/akunambol/akunambol-9999.ebuild            |    5 +--
 dev-cpp/eigen/eigen-9999.ebuild                    |    4 +-
 dev-libs/libattica/libattica-9999.ebuild           |    2 +-
 dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild |    4 +-
 dev-libs/libdbusmenu/libdbusmenu-0.3.94-r2.ebuild  |    9 +-----
 dev-libs/libindicate/libindicate-0.4.91-r2.ebuild  |   28 +++++++------------
 .../shared-desktop-ontologies-9999.ebuild          |    2 +-
 dev-libs/soprano/soprano-9999.ebuild               |   12 +++-----
 dev-util/automoc/automoc-9999.ebuild               |    2 +-
 .../cpp-dependency-analyzer-9999.ebuild            |    8 +----
 .../kdevelop-mercurial-9999.ebuild                 |    8 +----
 dev-util/kdevelop-pg-qt/kdevelop-pg-qt-9999.ebuild |    2 +-
 .../kdevelop-php-docs-9999.ebuild                  |    2 +-
 dev-util/kdevelop-php/kdevelop-php-9999.ebuild     |    2 +-
 dev-util/kdevplatform/kdevplatform-9999.ebuild     |    2 +-
 dev-util/krazy2/krazy2-9999.ebuild                 |   14 +++------
 dev-util/kxsldbg/kxsldbg-9999.ebuild               |    2 +-
 dev-vcs/kdesvn/kdesvn-9999.ebuild                  |    2 +-
 games-board/kaya/kaya-9999.ebuild                  |    5 ++-
 .../akonadi-googledata-1.2.0.ebuild                |    4 +-
 .../akonadi-googledata-9999.ebuild                 |    7 ++---
 kde-misc/basket/basket-9999.ebuild                 |    4 +-
 kde-misc/chromi/chromi-0.2.ebuild                  |    4 +-
 .../{youtube-servicemenu => chromi}/metadata.xml   |    0
 kde-misc/commandwatch/commandwatch-0.1.1.ebuild    |    4 +-
 kde-misc/cpuload/cpuload-0.3.2.ebuild              |    4 +-
 kde-misc/devicemanager/devicemanager-1.1.1.ebuild  |    4 +-
 kde-misc/drop2ftp/drop2ftp-0.6.ebuild              |    4 +-
 kde-misc/eventlist/eventlist-0.2.3.ebuild          |    2 +-
 kde-misc/extragear-l10n/extragear-l10n-9999.ebuild |    4 +-
 .../metadata.xml                                   |    0
 kde-misc/eyesaver/eyesaver-0.2a.ebuild             |    4 +-
 kde-misc/fsrunner/fsrunner-0.6.ebuild              |    4 +-
 kde-misc/geekclock/geekclock-1.0.ebuild            |    4 +-
 kde-misc/ihatethecashew/ihatethecashew-0.4.ebuild  |    4 +-
 kde-misc/kannasaver/kannasaver-1.2.ebuild          |    5 ++-
 .../metadata.xml                                   |    0
 kde-misc/kappfinder/kappfinder-9999.ebuild         |    6 ++--
 .../katelatexplugin/katelatexplugin-0.2.ebuild     |    6 ++--
 kde-misc/kblogger/kblogger-1.0_alpha3.ebuild       |    2 +-
 kde-misc/kbstateapplet/kbstateapplet-9999.ebuild   |    4 +-
 kde-misc/kcheckgmail/kcheckgmail-9999.ebuild       |    2 +-
 kde-misc/kcm_touchpad/kcm_touchpad-9999.ebuild     |    2 +-
 .../kde-overlay-servicemenus-0.1.ebuild            |   12 ++++----
 kde-misc/kdiff3/kdiff3-9999.ebuild                 |    2 +-
 kde-misc/kepas/kepas-0.9.3.ebuild                  |    8 +++---
 kde-misc/kepas/kepas-9999.ebuild                   |    8 +++---
 kde-misc/kgrubeditor/kgrubeditor-9999.ebuild       |    2 +-
 kde-misc/kio-sysinfo/kio-sysinfo-9999.ebuild       |    2 +-
 .../knetworkmanager/knetworkmanager-9999.ebuild    |    2 +-
 kde-misc/knutclient/knutclient-1.0_pre1.ebuild     |    2 +-
 kde-misc/kobby/kobby-1.0_beta5.ebuild              |    2 +-
 kde-misc/konstruktor/konstruktor-0.9_beta1.ebuild  |    2 +-
 kde-misc/kpackagekit/kpackagekit-9999.ebuild       |    2 +-
 kde-misc/kregexpeditor/kregexpeditor-9999.ebuild   |    2 +-
 kde-misc/krusader/krusader-9999.ebuild             |    6 +++-
 kde-misc/ksoprano/ksoprano-0.2.ebuild              |    6 ++--
 kde-misc/kustodian/kustodian-9999.ebuild           |    4 +-
 kde-misc/kwebkitpart/kwebkitpart-9999.ebuild       |    2 +-
 .../massif-visualizer-9999.ebuild                  |    2 +-
 .../metadata.xml                                   |    0
 kde-misc/menubar/menubar-9999.ebuild               |    4 +-
 kde-misc/miniplayer/miniplayer-1.0.ebuild          |    4 +-
 kde-misc/onelinecalc/onelinecalc-0.2.ebuild        |    4 +-
 kde-misc/panelspacer/panelspacer-0.2.ebuild        |    4 +-
 kde-misc/pgame/pgame-0.3.ebuild                    |    4 +-
 kde-misc/pgame/pgame-0.4.ebuild                    |    4 +-
 .../plasma-emergelog/plasma-emergelog-0.0.1.ebuild |    4 +-
 .../plasma-emergelog/plasma-emergelog-0.0.2.ebuild |    4 +-
 .../plasma-emergelog/plasma-emergelog-9999.ebuild  |    2 +-
 kde-misc/plasma-mobile/plasma-mobile-9999.ebuild   |    6 ++--
 .../plasma-widget-menubar-0.1.14.ebuild            |   10 ++-----
 kde-misc/plasma-wifi/plasma-wifi-0.5-r1.ebuild     |    4 +-
 kde-misc/playwolf/playwolf-0.7.2.ebuild            |    6 ++--
 .../polkit-kde-kcmodules-9999.ebuild               |    2 +-
 .../publictransport/publictransport-0.6.10.ebuild  |    4 +-
 kde-misc/simplemonitor/simplemonitor-0.1-r4.ebuild |    4 +-
 .../simpleweatherforecast-1.2.ebuild               |    4 +-
 .../metadata.xml                                   |    0
 kde-misc/socket-sentry/socket-sentry-0.9.3.ebuild  |    5 ++-
 kde-misc/stasks/stasks-0.5.1.ebuild                |   14 +++------
 .../stdin-plasmoid/stdin-plasmoid-0.2_beta1.ebuild |    4 +-
 kde-misc/todo-list/todo-list-0.4.ebuild            |    4 +-
 .../toggle-compositing-0.2.3.ebuild                |    4 +-
 kde-misc/translatoid/translatoid-0.9.ebuild        |    4 +-
 kde-misc/translatoid/translatoid-9999.ebuild       |    4 +-
 kde-misc/yakuake/yakuake-9999.ebuild               |    2 +-
 media-gfx/kflickr/kflickr-9999.ebuild              |    2 +-
 media-gfx/lprof/lprof-1.12_p20091229.ebuild        |    2 +-
 media-libs/gluon/gluon-9999.ebuild                 |    2 +-
 media-libs/liblastfm/liblastfm-9999.ebuild         |   12 ++------
 media-libs/opengtl/opengtl-0.9.8.ebuild            |    2 +
 media-libs/opengtl/opengtl-0.9.9.ebuild            |    2 +
 media-libs/taglib-extras/taglib-extras-9999.ebuild |    2 +-
 media-sound/amarok/amarok-9999.ebuild              |   21 +++++++--------
 .../kaudiocreator/kaudiocreator-9999.ebuild        |    6 ++--
 media-sound/kguitar/kguitar-9999.ebuild            |    4 +-
 media-sound/kradio/kradio-9999.ebuild              |    2 +-
 .../qt-gstreamer}/metadata.xml                     |    0
 .../qt-gstreamer/qt-gstreamer-0.10.1.ebuild        |    2 +-
 media-sound/qt-gstreamer/qt-gstreamer-9999.ebuild  |    4 +-
 media-video/bangarang/bangarang-9999.ebuild        |    4 +-
 media-video/kamoso/kamoso-9999.ebuild              |    2 +-
 media-video/kmplayer/kmplayer-9999.ebuild          |    2 +-
 media-video/recorditnow/metadata.xml               |    5 +++-
 media-video/recorditnow/recorditnow-0.4.ebuild     |    2 +-
 media-video/recorditnow/recorditnow-9999.ebuild    |    2 +-
 .../subtitlecomposer/subtitlecomposer-9999.ebuild  |    2 +-
 net-im/choqok/choqok-9999.ebuild                   |    6 ++--
 net-irc/aki/aki-9999.ebuild                        |    2 +-
 net-irc/konversation/konversation-9999.ebuild      |    2 +-
 net-libs/libbluedevil/libbluedevil-9999.ebuild     |    2 +-
 net-libs/libgcal/libgcal-9999.ebuild               |    4 +-
 net-libs/libktorrent/libktorrent-9999.ebuild       |    2 +-
 .../libqinfinity/libqinfinity-1.0_beta5.ebuild     |    2 +-
 net-libs/likeback/likeback-9999.ebuild             |    7 +----
 .../likeback}/metadata.xml                         |    0
 net-p2p/ktorrent/ktorrent-9999.ebuild              |    4 +-
 net-wireless/bluedevil/bluedevil-9999.ebuild       |    2 +-
 .../kdm-plugin-pam-face-authentication-0.2.ebuild  |    2 +-
 sys-auth/nss-mdns/nss-mdns-0.10-r1.ebuild          |   13 ++-------
 .../pam-face-authentication-0.3.ebuild             |    2 +-
 .../polkit-kde-agent/polkit-kde-agent-9999.ebuild  |    2 +-
 sys-auth/polkit-qt/polkit-qt-9999.ebuild           |    2 +-
 sys-block/kvpm/kvpm-0.7.1.ebuild                   |    2 +-
 .../partitionmanager/partitionmanager-9999.ebuild  |    2 +-
 www-client/rekonq/rekonq-9999.ebuild               |    2 +-
 .../qtscriptgenerator-9999.ebuild                  |   17 ++++--------
 x11-misc/wmiface/wmiface-2.1.ebuild                |    2 +-
 x11-themes/bespin/bespin-9999.ebuild               |    2 +-
 x11-themes/oxygen-gtk/oxygen-gtk-9999.ebuild       |    3 +-
 139 files changed, 257 insertions(+), 307 deletions(-)

diff --git a/app-backup/timevault/timevault-9999.ebuild b/app-backup/timevault/timevault-9999.ebuild
index 516888d..875e5d7 100644
--- a/app-backup/timevault/timevault-9999.ebuild
+++ b/app-backup/timevault/timevault-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KDE_SCM="git"
 inherit kde4-base
@@ -21,5 +21,5 @@ RDEPEND="${DEPEND}"
 
 src_install() {
 	kde4-base_src_install
-	rm "${D}/usr/share/apps/cmake/modules/PkgConfigGetVar.cmake" || die "workaround deletion failed"
+	rm "${ED}/usr/share/apps/cmake/modules/PkgConfigGetVar.cmake" || die "workaround deletion failed"
 }

diff --git a/app-cdr/k3b/k3b-9999.ebuild b/app-cdr/k3b/k3b-9999.ebuild
index c9297fe..7f04b67 100644
--- a/app-cdr/k3b/k3b-9999.ebuild
+++ b/app-cdr/k3b/k3b-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 CMAKE_MIN_VERSION=2.8.0
 MULTIMEDIA_REQUIRED=always

diff --git a/app-cdr/k9copy/k9copy-9999.ebuild b/app-cdr/k9copy/k9copy-9999.ebuild
index b0e86cd..d50825d 100644
--- a/app-cdr/k9copy/k9copy-9999.ebuild
+++ b/app-cdr/k9copy/k9copy-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 if [[ ${PV} != *9999* ]]; then
 	KDE_LINGUAS="ca cs da de el es_AR es fr it ja nl pl pt_BR ru sr@Latn sr tr zh_TW"

diff --git a/app-editors/kile/kile-9999.ebuild b/app-editors/kile/kile-9999.ebuild
index 35ccc1e..0a30612 100644
--- a/app-editors/kile/kile-9999.ebuild
+++ b/app-editors/kile/kile-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-editors/kile/kile-2.1_beta4.ebuild,v 1.6 2010/10/06 23:48:08 tampakrap Exp $
 
-EAPI=3
+EAPI=4
 
 KDE_DOC_DIRS="doc"
 KDE_HANDBOOK="optional"

diff --git a/app-misc/strigi/strigi-9999.ebuild b/app-misc/strigi/strigi-9999.ebuild
index e8a2ad6..e38c6a4 100644
--- a/app-misc/strigi/strigi-9999.ebuild
+++ b/app-misc/strigi/strigi-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 if [[ "${PV}" != "9999" ]]; then
 	SRC_URI=""

diff --git a/app-office/akonadi-server/akonadi-server-9999.ebuild b/app-office/akonadi-server/akonadi-server-9999.ebuild
index c76d6e8..f907d9a 100644
--- a/app-office/akonadi-server/akonadi-server-9999.ebuild
+++ b/app-office/akonadi-server/akonadi-server-9999.ebuild
@@ -81,7 +81,7 @@ src_install() {
 Driver=${DRIVER}
 EOF
 	insinto /usr/share/config/akonadi
-	doins "${T}"/akonadiserverrc || die "doins failed"
+	doins "${T}"/akonadiserverrc
 
 	cmake-utils_src_install
 }

diff --git a/app-office/kmymoney/kmymoney-9999.ebuild b/app-office/kmymoney/kmymoney-9999.ebuild
index 45b0f49..c46f28d 100644
--- a/app-office/kmymoney/kmymoney-9999.ebuild
+++ b/app-office/kmymoney/kmymoney-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney/kmymoney-4.5.ebuild,v 1.1 2010/08/18 21:29:48 reavertm Exp $
 
-EAPI=3
+EAPI=4
 
 KMNAME="extragear/office"
 

diff --git a/app-office/skrooge/skrooge-9999.ebuild b/app-office/skrooge/skrooge-9999.ebuild
index 244a710..94ec253 100644
--- a/app-office/skrooge/skrooge-9999.ebuild
+++ b/app-office/skrooge/skrooge-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 #KDE_LINGUAS="bg ca da de en_GB es et fr gl it lt ms nds nl pl pt pt_BR ro sk sv
 #tr uk zh_CN"

diff --git a/app-pda/akunambol/akunambol-9999.ebuild b/app-pda/akunambol/akunambol-9999.ebuild
index 0101351..539e8e3 100644
--- a/app-pda/akunambol/akunambol-9999.ebuild
+++ b/app-pda/akunambol/akunambol-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KDE_SCM="git"
 inherit kde4-base
@@ -18,8 +18,7 @@ IUSE=""
 DEPEND="
 	app-office/akonadi-server
 	>=app-pda/funambol-client-sdk-9999
-	>=kde-base/kdelibs-${KDE_MINIMAL}
-	>=kde-base/kdepimlibs-${KDE_MINIMAL}
+	$(add_kdebase_dep kdepimlibs)
 	net-libs/likeback
 "
 RDEPEND="${DEPEND}"

diff --git a/dev-cpp/eigen/eigen-9999.ebuild b/dev-cpp/eigen/eigen-9999.ebuild
index c969de7..6fde504 100644
--- a/dev-cpp/eigen/eigen-9999.ebuild
+++ b/dev-cpp/eigen/eigen-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit cmake-utils mercurial
 
@@ -55,6 +55,6 @@ src_install() {
 
 	if use examples; then
 		cd "${CMAKE_BUILD_DIR}"/demos
-		dobin mandelbrot/mandelbrot opengl/quaternion_demo || die "dobin failed"
+		dobin mandelbrot/mandelbrot opengl/quaternion_demo
 	fi
 }

diff --git a/dev-libs/libattica/libattica-9999.ebuild b/dev-libs/libattica/libattica-9999.ebuild
index 84545ec..274a94b 100644
--- a/dev-libs/libattica/libattica-9999.ebuild
+++ b/dev-libs/libattica/libattica-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit cmake-utils git-2
 

diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild
index cddd785..14021ea 100644
--- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild
+++ b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-9999.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 QT_DEPEND="4.6.3"
 inherit cmake-utils virtualx
 
 if [[ "${PV}" = 9999* ]] ; then
-	inherit git
+	inherit git-2
 
 	EGIT_REPO_URI="git://gitorious.org/dbusmenu/dbusmenu-qt.git"
 

diff --git a/dev-libs/libdbusmenu/libdbusmenu-0.3.94-r2.ebuild b/dev-libs/libdbusmenu/libdbusmenu-0.3.94-r2.ebuild
index 277e40f..9452d3d 100644
--- a/dev-libs/libdbusmenu/libdbusmenu-0.3.94-r2.ebuild
+++ b/dev-libs/libdbusmenu/libdbusmenu-0.3.94-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu/libdbusmenu-0.2.8.ebuild,v 1.2 2010/09/14 07:41:41 reavertm Exp $
 
-EAPI=3
+EAPI=4
 
 inherit autotools eutils versionator virtualx
 
@@ -82,10 +82,5 @@ src_configure() {
 }
 
 src_test() {
-	Xemake check || die "testsuite failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS || die "dodoc failed"
+	Xemake check
 }

diff --git a/dev-libs/libindicate/libindicate-0.4.91-r2.ebuild b/dev-libs/libindicate/libindicate-0.4.91-r2.ebuild
index 556ecc6..20488d3 100644
--- a/dev-libs/libindicate/libindicate-0.4.91-r2.ebuild
+++ b/dev-libs/libindicate/libindicate-0.4.91-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/libindicate-0.4.4.ebuild,v 1.1 2011/01/17 09:34:20 tampakrap Exp $
 
-EAPI=2
+EAPI=4
 
 inherit autotools eutils versionator
 
@@ -41,16 +41,13 @@ DEPEND="${RDEPEND}
 	dev-util/gtk-doc-am
 	dev-util/pkgconfig"
 
-pkg_setup() {
-	if use mono && has "${PV}" "${BROKEN_MONO}" ; then
-		eerror "Mono bindings (USE=mono) are broken in this version"
-		die "Mono bindings (USE=mono) are broken in this version"
-	fi
-	if use python && use !gtk ; then
-		eerror "Python bindings (USE=python) require GTK support (USE=gtk)"
-		die "Python bindings (USE=python) require GTK support (USE=gtk)"
-	fi
-}
+REQUIRED_USE="python? ( gtk )"
+DOCS=( AUTHORS )
+
+if has "${PV}" ${BROKEN_MONO}; then
+	# Mono bindings are broken in this version, forbid
+	REQUIRED_USE+=" !mono"
+fi
 
 src_prepare() {
 	# Make python optional, launchpad-bug #643921
@@ -96,14 +93,9 @@ src_configure() {
 		$(use_enable introspection) \
 		$(use_enable mono) \
 		$(use_enable python) \
-		${conf} || die "configure failed"
+		${conf}
 }
 
 src_test() {
-	emake check || die "testsuite failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS || die "dodoc failed"
+	emake check
 }

diff --git a/dev-libs/shared-desktop-ontologies/shared-desktop-ontologies-9999.ebuild b/dev-libs/shared-desktop-ontologies/shared-desktop-ontologies-9999.ebuild
index 22d38d2..dc75aaa 100644
--- a/dev-libs/shared-desktop-ontologies/shared-desktop-ontologies-9999.ebuild
+++ b/dev-libs/shared-desktop-ontologies/shared-desktop-ontologies-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit cmake-utils git-2
 

diff --git a/dev-libs/soprano/soprano-9999.ebuild b/dev-libs/soprano/soprano-9999.ebuild
index 593c2c2..d98db39 100644
--- a/dev-libs/soprano/soprano-9999.ebuild
+++ b/dev-libs/soprano/soprano-9999.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
-inherit base cmake-utils flag-o-matic git
+inherit base cmake-utils flag-o-matic git-2
 
 DESCRIPTION="Library that provides a nice Qt interface to RDF storage solutions"
 HOMEPAGE="http://sourceforge.net/projects/soprano"
@@ -43,7 +43,7 @@ PATCHES=(
 pkg_setup() {
 	if [[ ${PV} = *9999* && -z $I_KNOW_WHAT_I_AM_DOING ]]; then
 		echo
-		ewarn "WARNING! This is an experimental ebuild of ${PN} SVN tree. Use at your own risk."
+		ewarn "WARNING! This is an experimental ebuild of ${PN} Git tree. Use at your own risk."
 		ewarn "Do _NOT_ file bugs at bugs.gentoo.org because of this ebuild!"
 		echo
 	fi
@@ -58,16 +58,12 @@ pkg_setup() {
 	fi
 }
 
-src_prepare() {
-	base_src_prepare
-}
-
 src_configure() {
 	# Fix for missing pthread.h linking
 	# NOTE: temporarily fix until a better cmake files patch will be provided.
 	use elibc_FreeBSD && append-flags -pthread
 
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DSOPRANO_BUILD_TESTS=OFF
 		-DCMAKE_SKIP_RPATH=OFF
 		-DSOPRANO_DISABLE_SESAME2_BACKEND=ON

diff --git a/dev-util/automoc/automoc-9999.ebuild b/dev-util/automoc/automoc-9999.ebuild
index 979bb1f..69ae8ff 100644
--- a/dev-util/automoc/automoc-9999.ebuild
+++ b/dev-util/automoc/automoc-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit cmake-utils flag-o-matic git-2
 

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 55f0427..d19c843 100644
--- a/dev-util/cpp-dependency-analyzer/cpp-dependency-analyzer-9999.ebuild
+++ b/dev-util/cpp-dependency-analyzer/cpp-dependency-analyzer-9999.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
-inherit git cmake-utils
+inherit git-2 cmake-utils
 
 DESCRIPTION="Tool that creates dependency graph of C++ code"
 HOMEPAGE="http://gitorious.org/cpp-dependency-analyzer/"
@@ -24,7 +24,3 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	>=dev-libs/boost-1.35.0
 "
-
-src_unpack() {
-	git_src_unpack
-}

diff --git a/dev-util/kdevelop-mercurial/kdevelop-mercurial-9999.ebuild b/dev-util/kdevelop-mercurial/kdevelop-mercurial-9999.ebuild
index e01b436..bec6d76 100644
--- a/dev-util/kdevelop-mercurial/kdevelop-mercurial-9999.ebuild
+++ b/dev-util/kdevelop-mercurial/kdevelop-mercurial-9999.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KMNAME="kdevelop"
 KDEVPLATFORM_VERSION="1.0.2"
-inherit subversion kde4-base
+inherit kde4-base
 
 DESCRIPTION="Mercurial plugin for KDevelop 4"
 HOMEPAGE="http://websvn.kde.org/trunk/playground/devtools/kdevelop4-extra-plugins/mercurial/"
@@ -19,7 +19,3 @@ IUSE="debug"
 RDEPEND="
 	dev-vcs/mercurial
 "
-
-src_unpack() {
-	subversion_src_unpack
-}

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 6818f37..0c83244 100644
--- a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-9999.ebuild
+++ b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KDE_SCM="git"
 inherit kde4-base

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 3b4c494..6c4c78d 100644
--- a/dev-util/kdevelop-php-docs/kdevelop-php-docs-9999.ebuild
+++ b/dev-util/kdevelop-php-docs/kdevelop-php-docs-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KMNAME="kdevelop"
 KDE_SCM="git"

diff --git a/dev-util/kdevelop-php/kdevelop-php-9999.ebuild b/dev-util/kdevelop-php/kdevelop-php-9999.ebuild
index 1af24c4..f43c00e 100644
--- a/dev-util/kdevelop-php/kdevelop-php-9999.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KMNAME="kdevelop"
 KDE_SCM="git"

diff --git a/dev-util/kdevplatform/kdevplatform-9999.ebuild b/dev-util/kdevplatform/kdevplatform-9999.ebuild
index 55bdfcf..d3bcba0 100644
--- a/dev-util/kdevplatform/kdevplatform-9999.ebuild
+++ b/dev-util/kdevplatform/kdevplatform-9999.ebuild
@@ -22,7 +22,7 @@ IUSE="cvs debug git reviewboard subversion"
 
 # Moved to playground for now
 # bazaar? ( dev-vcs/bzr )
-# kompare? ( >=kde-base/kompare-${KDE_MINIMAL} )
+# kompare? ( $(add_kdebase_dep kompare) )
 # mercurial? ( dev-vcs/mercurial )
 # block - some plugins moved to kdevplatform from kdevelop
 DEPEND="

diff --git a/dev-util/krazy2/krazy2-9999.ebuild b/dev-util/krazy2/krazy2-9999.ebuild
index a2f22e3..16e1651 100644
--- a/dev-util/krazy2/krazy2-9999.ebuild
+++ b/dev-util/krazy2/krazy2-9999.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
-inherit git perl-module qt4 cmake-utils
+inherit perl-module qt4 cmake-utils git-2
 
 DESCRIPTION="Source code sanity checker for KDE developers."
 HOMEPAGE="http://www.kde.org/"
@@ -28,10 +28,6 @@ RDEPEND="${DEPEND}
 
 CMAKE_USE_DIR="${S}/cppchecks"
 
-src_unpack() {
-	git_src_unpack
-}
-
 src_prepare() {
 	sed -i -e 's/+= ordered/+= ordered nostrip/' \
 		src/src.pro || die "failed to apply nostrip"
@@ -52,16 +48,16 @@ src_configure() {
 src_compile() {
 	cmake-utils_src_compile
 	cd src
-	emake "$@" || die "2nd Make failed!"
+	emake
 }
 
 src_install() {
-	dodoc README TODO || die "dodoc failed"
+	dodoc README TODO
 
 	cmake-utils_src_install
 
 	cd src
-	emake install INSTALL_ROOT="${D}/usr" || die "Make src install failed"
+	emake install INSTALL_ROOT="${D}/usr"
 	cd ..
 
 	./install.sh "${D}/usr" || die "install failed"

diff --git a/dev-util/kxsldbg/kxsldbg-9999.ebuild b/dev-util/kxsldbg/kxsldbg-9999.ebuild
index 7b84a33..f60ceca 100644
--- a/dev-util/kxsldbg/kxsldbg-9999.ebuild
+++ b/dev-util/kxsldbg/kxsldbg-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KMNAME="extragear/sdk"
 inherit kde4-meta

diff --git a/dev-vcs/kdesvn/kdesvn-9999.ebuild b/dev-vcs/kdesvn/kdesvn-9999.ebuild
index 29c6fb2..28e4c2e 100644
--- a/dev-vcs/kdesvn/kdesvn-9999.ebuild
+++ b/dev-vcs/kdesvn/kdesvn-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KDE_LINGUAS="cs de es fr it ja lt nl pl pt_BR ro ru"
 inherit kde4-base

diff --git a/games-board/kaya/kaya-9999.ebuild b/games-board/kaya/kaya-9999.ebuild
index 7572a85..caf0d07 100644
--- a/games-board/kaya/kaya-9999.ebuild
+++ b/games-board/kaya/kaya-9999.ebuild
@@ -16,9 +16,10 @@ SLOT="0"
 KEYWORDS=""
 IUSE=""
 
+DEPEND=""
 RDEPEND=""
-ruby_add_rdepend "kde-base/kdebindings-ruby"
-DEPEND="${RDEPEND}"
+ruby_add_bdepend "$(add_kdebase_dep kdebindings-ruby)"
+ruby_add_rdepend "$(add_kdebase_dep kdebindings-ruby)"
 
 pkg_setup() {
 	ruby-ng_pkg_setup

diff --git a/kde-misc/akonadi-googledata/akonadi-googledata-1.2.0.ebuild b/kde-misc/akonadi-googledata/akonadi-googledata-1.2.0.ebuild
index d6ac85a..e96dcfa 100644
--- a/kde-misc/akonadi-googledata/akonadi-googledata-1.2.0.ebuild
+++ b/kde-misc/akonadi-googledata/akonadi-googledata-1.2.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KDE_LINGUAS="ca ca@valencia cs da de en_GB eo es et fi fr ga gl hr hu is km lt
 lv nb nds nl pt pt_BR ro sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv th
@@ -22,7 +22,7 @@ IUSE="debug"
 DEPEND="
 	dev-libs/boost
 	dev-libs/libxslt
-	>=kde-base/kdepimlibs-${KDE_MINIMAL}[semantic-desktop]
+	$(add_kdebase_dep kdepimlibs semantic-desktop)
 	>=net-libs/libgcal-0.9.6
 "
 RDEPEND="${DEPEND}

diff --git a/kde-misc/akonadi-googledata/akonadi-googledata-9999.ebuild b/kde-misc/akonadi-googledata/akonadi-googledata-9999.ebuild
index 1a13ee6..5085f0e 100644
--- a/kde-misc/akonadi-googledata/akonadi-googledata-9999.ebuild
+++ b/kde-misc/akonadi-googledata/akonadi-googledata-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KMNAME="extragear/pim"
 KMMODULE="googledata"
@@ -18,7 +18,7 @@ IUSE="debug"
 DEPEND="
 	dev-libs/boost
 	dev-libs/libxslt
-	>=kde-base/kdepimlibs-${KDE_MINIMAL}[semantic-desktop]
+	$(add_kdebase_dep kdepimlibs semantic-desktop)
 	>=net-libs/libgcal-0.9.6
 "
 RDEPEND="${DEPEND}
@@ -26,7 +26,6 @@ RDEPEND="${DEPEND}
 "
 
 src_configure() {
-	local mycmakeargs
-	mycmakeargs=(-DLIBGCAL_INCLUDE_DIR=/usr/include/libgcal)
+	local mycmakeargs=(-DLIBGCAL_INCLUDE_DIR="${EPREFIX}"/usr/include/libgcal)
 	kde4-base_src_configure
 }

diff --git a/kde-misc/basket/basket-9999.ebuild b/kde-misc/basket/basket-9999.ebuild
index e6ab656..085e8f0 100644
--- a/kde-misc/basket/basket-9999.ebuild
+++ b/kde-misc/basket/basket-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 VIRTUALX_REQUIRED=test
 KDE_SCM="git"
@@ -26,7 +26,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		$(cmake-utils_use_enable crypt)
 	)
 	kde4-base_src_configure

diff --git a/kde-misc/chromi/chromi-0.2.ebuild b/kde-misc/chromi/chromi-0.2.ebuild
index 00d5438..54c6ac2 100644
--- a/kde-misc/chromi/chromi-0.2.ebuild
+++ b/kde-misc/chromi/chromi-0.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 inherit kde4-base
 
 RESTRICT="$RESTRICT mirror"
@@ -18,5 +18,5 @@ IUSE=""
 
 S="${WORKDIR}/jinliu-kwin-deco-chromi-4390e63"
 
-DEPEND=">kde-base/kwin-4.4.1"
+DEPEND="$(add_kdebase_dep kwin "" 4.4.1)"
 RDEPEND="${DEPEND}"

diff --git a/kde-misc/youtube-servicemenu/metadata.xml b/kde-misc/chromi/metadata.xml
similarity index 100%
copy from kde-misc/youtube-servicemenu/metadata.xml
copy to kde-misc/chromi/metadata.xml

diff --git a/kde-misc/commandwatch/commandwatch-0.1.1.ebuild b/kde-misc/commandwatch/commandwatch-0.1.1.ebuild
index f38b917..94a0564 100644
--- a/kde-misc/commandwatch/commandwatch-0.1.1.ebuild
+++ b/kde-misc/commandwatch/commandwatch-0.1.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit kde4-base
 
@@ -17,5 +17,5 @@ IUSE="debug"
 
 RDEPEND="
 	!kde-plasmoids/commandwatch
-	>=kde-base/plasma-workspace-${KDE_MINIMAL}
+	$(add_kdebase_dep plasma-workspace)
 "

diff --git a/kde-misc/cpuload/cpuload-0.3.2.ebuild b/kde-misc/cpuload/cpuload-0.3.2.ebuild
index b2b0b37..32d0b6e 100644
--- a/kde-misc/cpuload/cpuload-0.3.2.ebuild
+++ b/kde-misc/cpuload/cpuload-0.3.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit kde4-base
 
@@ -17,7 +17,7 @@ IUSE="debug"
 
 RDEPEND="
 	!kde-plasmoids/cpuload
-	>=kde-base/plasma-workspace-${KDE_MINIMAL}
+	$(add_kdebase_dep plasma-workspace)
 "
 
 S="${WORKDIR}"/"${PN}"

diff --git a/kde-misc/devicemanager/devicemanager-1.1.1.ebuild b/kde-misc/devicemanager/devicemanager-1.1.1.ebuild
index 1705896..2c9848f 100644
--- a/kde-misc/devicemanager/devicemanager-1.1.1.ebuild
+++ b/kde-misc/devicemanager/devicemanager-1.1.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit kde4-base
 
@@ -16,7 +16,7 @@ SLOT="0"
 IUSE="debug"
 
 RDEPEND="
-	>=kde-base/plasma-workspace-${KDE_MINIMAL}
+	$(add_kdebase_dep plasma-workspace)
 "
 
 S="${WORKDIR}/${PN}"

diff --git a/kde-misc/drop2ftp/drop2ftp-0.6.ebuild b/kde-misc/drop2ftp/drop2ftp-0.6.ebuild
index c33f236..b20c880 100644
--- a/kde-misc/drop2ftp/drop2ftp-0.6.ebuild
+++ b/kde-misc/drop2ftp/drop2ftp-0.6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit kde4-base
 
@@ -17,5 +17,5 @@ IUSE="debug"
 
 RDEPEND="
 	!kde-plasmoids/drop2ftp
-	>=kde-base/plasma-workspace-${KDE_MINIMAL}
+	$(add_kdebase_dep plasma-workspace)
 "

diff --git a/kde-misc/eventlist/eventlist-0.2.3.ebuild b/kde-misc/eventlist/eventlist-0.2.3.ebuild
index b8633af..cdde896 100644
--- a/kde-misc/eventlist/eventlist-0.2.3.ebuild
+++ b/kde-misc/eventlist/eventlist-0.2.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit kde4-base
 

diff --git a/kde-misc/extragear-l10n/extragear-l10n-9999.ebuild b/kde-misc/extragear-l10n/extragear-l10n-9999.ebuild
index 706a474..84f241d 100644
--- a/kde-misc/extragear-l10n/extragear-l10n-9999.ebuild
+++ b/kde-misc/extragear-l10n/extragear-l10n-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit kde4-base
 
@@ -69,7 +69,7 @@ src_prepare() {
 
 	for lng in ${enabled_linguas}; do
 		mkdir -p "${S}/${lng}_extra"/docs "${S}/${lng}_extra"/messages
-		mv "${S}/${lng}"/docs/extragear* "${S}/${lng}_extra"/docs 
+		mv "${S}/${lng}"/docs/extragear* "${S}/${lng}_extra"/docs
 		mv "${S}/${lng}"/docs/playground* "${S}/${lng}_extra"/docs
 		mv "${S}/${lng}"/docs/kdereview "${S}/${lng}_extra"/docs
 		mv "${S}/${lng}"/docs/kdevelop "${S}/${lng}_extra"/docs

diff --git a/kde-misc/youtube-servicemenu/metadata.xml b/kde-misc/extragear-l10n/metadata.xml
similarity index 100%
copy from kde-misc/youtube-servicemenu/metadata.xml
copy to kde-misc/extragear-l10n/metadata.xml

diff --git a/kde-misc/eyesaver/eyesaver-0.2a.ebuild b/kde-misc/eyesaver/eyesaver-0.2a.ebuild
index 20a62de..4f10af5 100644
--- a/kde-misc/eyesaver/eyesaver-0.2a.ebuild
+++ b/kde-misc/eyesaver/eyesaver-0.2a.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit kde4-base
 
@@ -19,7 +19,7 @@ IUSE="debug"
 
 RDEPEND="
 	!kde-plasmoids/eyesaver
-	>=kde-base/plasma-workspace-${KDE_MINIMAL}
+	$(add_kdebase_dep plasma-workspace)
 "
 
 S="${WORKDIR}/${MY_P}"

diff --git a/kde-misc/fsrunner/fsrunner-0.6.ebuild b/kde-misc/fsrunner/fsrunner-0.6.ebuild
index 23562f0..5e8be13 100644
--- a/kde-misc/fsrunner/fsrunner-0.6.ebuild
+++ b/kde-misc/fsrunner/fsrunner-0.6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit kde4-base
 
@@ -16,7 +16,7 @@ SLOT="0"
 IUSE="debug"
 
 src_configure() {
-	mycmakeargs=(-DPROFILE=ON)
+	local mycmakeargs=(-DPROFILE=ON)
 
 	kde4-base_src_configure
 }

diff --git a/kde-misc/geekclock/geekclock-1.0.ebuild b/kde-misc/geekclock/geekclock-1.0.ebuild
index c6bb9b3..89828cd 100644
--- a/kde-misc/geekclock/geekclock-1.0.ebuild
+++ b/kde-misc/geekclock/geekclock-1.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit kde4-base
 
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
 RDEPEND="
-	>=kde-base/plasma-workspace-${KDE_MINIMAL}
+	$(add_kdebase_dep plasma-workspace)
 "
 
 S="${WORKDIR}/${MY_PN}-${PV}-src"

diff --git a/kde-misc/ihatethecashew/ihatethecashew-0.4.ebuild b/kde-misc/ihatethecashew/ihatethecashew-0.4.ebuild
index 0f748eb..210fccf 100644
--- a/kde-misc/ihatethecashew/ihatethecashew-0.4.ebuild
+++ b/kde-misc/ihatethecashew/ihatethecashew-0.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit kde4-base
 
@@ -18,7 +18,7 @@ SLOT="0"
 IUSE="debug"
 
 RDEPEND="
-	>=kde-base/plasma-workspace-${KDE_MINIMAL}
+	$(add_kdebase_dep plasma-workspace)
 "
 
 S="${WORKDIR}/${MY_PN}"

diff --git a/kde-misc/kannasaver/kannasaver-1.2.ebuild b/kde-misc/kannasaver/kannasaver-1.2.ebuild
index 7833640..bda4f20 100644
--- a/kde-misc/kannasaver/kannasaver-1.2.ebuild
+++ b/kde-misc/kannasaver/kannasaver-1.2.ebuild
@@ -2,8 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
+KDE_MINIMAL=4.6
 inherit kde4-base
 
 RESTRICT="$RESTRICT mirror"
@@ -20,6 +21,6 @@ SLOT="0"
 IUSE="debug"
 
 RDEPEND="
-	>=kde-base/kscreensaver-4.6.0
+	$(add_kdebase_dep kscreensaver)
 "
 

diff --git a/kde-misc/youtube-servicemenu/metadata.xml b/kde-misc/kannasaver/metadata.xml
similarity index 100%
copy from kde-misc/youtube-servicemenu/metadata.xml
copy to kde-misc/kannasaver/metadata.xml

diff --git a/kde-misc/kappfinder/kappfinder-9999.ebuild b/kde-misc/kappfinder/kappfinder-9999.ebuild
index 33a80ca..fd88238 100644
--- a/kde-misc/kappfinder/kappfinder-9999.ebuild
+++ b/kde-misc/kappfinder/kappfinder-9999.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KMNAME="extragear/base"
 inherit kde4-meta
 
 DESCRIPTION="KDE tool that looks for well-known apps in your path and creates entries for them in the KDE menu"
-HOMEPAGE="http://kde.org"
+HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 KEYWORDS=""
@@ -16,5 +16,5 @@ SLOT="4"
 IUSE="debug +handbook"
 
 RDEPEND="
-	!kdeprefix? ( !>=kde-base/kappfinder-4.0.0 )
+	!kde-base/kappfinder[-kdeprefix]
 "

diff --git a/kde-misc/katelatexplugin/katelatexplugin-0.2.ebuild b/kde-misc/katelatexplugin/katelatexplugin-0.2.ebuild
index 803253d..5d86b4f 100644
--- a/kde-misc/katelatexplugin/katelatexplugin-0.2.ebuild
+++ b/kde-misc/katelatexplugin/katelatexplugin-0.2.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit kde4-base
 
 DESCRIPTION="Kate LaTeX typesetting plugin"
-HOMEPAGE="http://www.kde-apps.org/content/show.php/Kate+LaTeX+typesetting+plugin?content=84772" 
+HOMEPAGE="http://www.kde-apps.org/content/show.php/Kate+LaTeX+typesetting+plugin?content=84772"
 SRC_URI="http://www.kde-apps.org/CONTENT/content-files/84772-${P}.tar.bz2"
 
 LICENSE="GPL-3"
@@ -16,7 +16,7 @@ SLOT="4"
 IUSE="debug"
 
 RDEPEND="
-	>=kde-base/kate-${KDE_MINIMAL}
+	$(add_kdebase_dep kate)
 "
 
 S="${WORKDIR}/${PN}"

diff --git a/kde-misc/kblogger/kblogger-1.0_alpha3.ebuild b/kde-misc/kblogger/kblogger-1.0_alpha3.ebuild
index d078755..239e914 100644
--- a/kde-misc/kblogger/kblogger-1.0_alpha3.ebuild
+++ b/kde-misc/kblogger/kblogger-1.0_alpha3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit kde4-base
 

diff --git a/kde-misc/kbstateapplet/kbstateapplet-9999.ebuild b/kde-misc/kbstateapplet/kbstateapplet-9999.ebuild
index 5a831f2..03035d2 100644
--- a/kde-misc/kbstateapplet/kbstateapplet-9999.ebuild
+++ b/kde-misc/kbstateapplet/kbstateapplet-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KMNAME="playground/base/plasma"
 KMMODULE="applets/${PN}"
@@ -17,5 +17,5 @@ SLOT="0"
 IUSE="debug"
 
 RDEPEND="
-	>=kde-base/plasma-workspace-${KDE_MINIMAL}
+	$(add_kdebase_dep plasma-workspace)
 "

diff --git a/kde-misc/kcheckgmail/kcheckgmail-9999.ebuild b/kde-misc/kcheckgmail/kcheckgmail-9999.ebuild
index 793e1b9..b1d922c 100644
--- a/kde-misc/kcheckgmail/kcheckgmail-9999.ebuild
+++ b/kde-misc/kcheckgmail/kcheckgmail-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KDE_SCM="git"
 inherit kde4-base

diff --git a/kde-misc/kcm_touchpad/kcm_touchpad-9999.ebuild b/kde-misc/kcm_touchpad/kcm_touchpad-9999.ebuild
index 820014d..933a698 100644
--- a/kde-misc/kcm_touchpad/kcm_touchpad-9999.ebuild
+++ b/kde-misc/kcm_touchpad/kcm_touchpad-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KDE_SCM="git"
 inherit kde4-base

diff --git a/kde-misc/kde-overlay-servicemenus/kde-overlay-servicemenus-0.1.ebuild b/kde-misc/kde-overlay-servicemenus/kde-overlay-servicemenus-0.1.ebuild
index aadb35e..b1818bb 100644
--- a/kde-misc/kde-overlay-servicemenus/kde-overlay-servicemenus-0.1.ebuild
+++ b/kde-misc/kde-overlay-servicemenus/kde-overlay-servicemenus-0.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 CMAKE_REQUIRED="never"
 KDE_REQUIRED="never"
@@ -13,16 +13,16 @@ HOMEPAGE="http://dev.gentoo.org/~reavertm/"
 SRC_URI="http://dev.gentoo.org/~reavertm/${P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 SLOT="0"
 IUSE=""
 
 RDEPEND="
-	>=kde-base/kdialog-${KDE_MINIMAL}
-	>=kde-base/kompare-${KDE_MINIMAL}
+	$(add_kdebase_dep kdialog)
+	$(add_kdebase_dep kompare)
 	|| (
-		>=kde-base/dolphin-${KDE_MINIMAL}
-		>=kde-base/konqueror-${KDE_MINIMAL}
+		( $(add_kdebase_dep dolphin) )
+		( $(add_kdebase_dep konqueror) )
 	)
 "
 

diff --git a/kde-misc/kdiff3/kdiff3-9999.ebuild b/kde-misc/kdiff3/kdiff3-9999.ebuild
index 4aa3b8f..ecb0c22 100644
--- a/kde-misc/kdiff3/kdiff3-9999.ebuild
+++ b/kde-misc/kdiff3/kdiff3-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.95-r1.ebuild,v 1.1 2011/01/12 22:46:57 tampakrap Exp $
 
-EAPI=3
+EAPI=4
 
 KDE_REQUIRED="optional"
 QT_MINIMAL="4.4.0"

diff --git a/kde-misc/kepas/kepas-0.9.3.ebuild b/kde-misc/kepas/kepas-0.9.3.ebuild
index 212c223..fd998d8 100644
--- a/kde-misc/kepas/kepas-0.9.3.ebuild
+++ b/kde-misc/kepas/kepas-0.9.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit kde4-base
 
@@ -17,7 +17,7 @@ IUSE="debug oscar zeroconf"
 
 RDEPEND="
 	!kde-plasmoids/kepas
-	>=kde-base/plasma-workspace-${KDE_MINIMAL}
-	oscar? ( >=kde-base/kopete-${KDE_MINIMAL}[oscar] )
-	zeroconf? ( >=kde-base/kdnssd-${KDE_MINIMAL} )
+	$(add_kdebase_dep plasma-workspace)
+	oscar? ( $(add_kdebase_dep kopete oscar) )
+	zeroconf? ( $(add_kdebase_dep kdnssd) )
 "

diff --git a/kde-misc/kepas/kepas-9999.ebuild b/kde-misc/kepas/kepas-9999.ebuild
index 2bcd3a3..0002f8c 100644
--- a/kde-misc/kepas/kepas-9999.ebuild
+++ b/kde-misc/kepas/kepas-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KMNAME="playground/network"
 inherit kde4-base
@@ -17,7 +17,7 @@ IUSE="debug oscar zeroconf"
 
 RDEPEND="
 	!kde-plasmoids/kepas
-	>=kde-base/plasma-workspace-${KDE_MINIMAL}
-	oscar? ( >=kde-base/kopete-${KDE_MINIMAL}[oscar] )
-	zeroconf? ( >=kde-base/kdnssd-${KDE_MINIMAL} )
+	$(add_kdebase_dep plasma-workspace)
+	oscar? ( $(add_kdebase_dep kopete oscar) )
+	zeroconf? ( $(add_kdebase_dep kdnssd) )
 "

diff --git a/kde-misc/kgrubeditor/kgrubeditor-9999.ebuild b/kde-misc/kgrubeditor/kgrubeditor-9999.ebuild
index 1cfc7ca..afca6bf 100644
--- a/kde-misc/kgrubeditor/kgrubeditor-9999.ebuild
+++ b/kde-misc/kgrubeditor/kgrubeditor-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit kde4-base
 

diff --git a/kde-misc/kio-sysinfo/kio-sysinfo-9999.ebuild b/kde-misc/kio-sysinfo/kio-sysinfo-9999.ebuild
index ef20c23..05f1fdd 100644
--- a/kde-misc/kio-sysinfo/kio-sysinfo-9999.ebuild
+++ b/kde-misc/kio-sysinfo/kio-sysinfo-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KMNAME="playground/base"
 KMMODULE="${PN/-/_}"

diff --git a/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild b/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild
index 561d6db..dc1e6b4 100644
--- a/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild
+++ b/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild
@@ -8,12 +8,12 @@ KDE_MINIMAL="4.6"
 
 KDE_SCM="git"
 EGIT_REPONAME="networkmanagement"
-[[ ${PV} = 9999* ]] && SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 inherit kde4-base
 
 DESCRIPTION="KDE frontend for NetworkManager"
 HOMEPAGE="http://kde.org/"
+[[ ${PV} != 9999* ]] && SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 KEYWORDS=""

diff --git a/kde-misc/knutclient/knutclient-1.0_pre1.ebuild b/kde-misc/knutclient/knutclient-1.0_pre1.ebuild
index 3ba4c00..7da9495 100644
--- a/kde-misc/knutclient/knutclient-1.0_pre1.ebuild
+++ b/kde-misc/knutclient/knutclient-1.0_pre1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit kde4-base
 

diff --git a/kde-misc/kobby/kobby-1.0_beta5.ebuild b/kde-misc/kobby/kobby-1.0_beta5.ebuild
index 57fe590..c78bc0b 100644
--- a/kde-misc/kobby/kobby-1.0_beta5.ebuild
+++ b/kde-misc/kobby/kobby-1.0_beta5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KDE_LINGUAS="fr"
 inherit kde4-base

diff --git a/kde-misc/konstruktor/konstruktor-0.9_beta1.ebuild b/kde-misc/konstruktor/konstruktor-0.9_beta1.ebuild
index bc0147b..5872155 100644
--- a/kde-misc/konstruktor/konstruktor-0.9_beta1.ebuild
+++ b/kde-misc/konstruktor/konstruktor-0.9_beta1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 MY_P="${P/_/-}"
 OPENGL_REQUIRED="always"

diff --git a/kde-misc/kpackagekit/kpackagekit-9999.ebuild b/kde-misc/kpackagekit/kpackagekit-9999.ebuild
index 17dd549..8d52307 100644
--- a/kde-misc/kpackagekit/kpackagekit-9999.ebuild
+++ b/kde-misc/kpackagekit/kpackagekit-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KMNAME="playground/sysadmin"
 inherit kde4-base

diff --git a/kde-misc/kregexpeditor/kregexpeditor-9999.ebuild b/kde-misc/kregexpeditor/kregexpeditor-9999.ebuild
index 5c5822e..fb8117d 100644
--- a/kde-misc/kregexpeditor/kregexpeditor-9999.ebuild
+++ b/kde-misc/kregexpeditor/kregexpeditor-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KMNAME="playground/utils"
 KMMODULE="${PN}"

diff --git a/kde-misc/krusader/krusader-9999.ebuild b/kde-misc/krusader/krusader-9999.ebuild
index 789580c..fb8330d 100644
--- a/kde-misc/krusader/krusader-9999.ebuild
+++ b/kde-misc/krusader/krusader-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KDE_SCM="git"
 inherit kde4-base
@@ -16,7 +16,9 @@ SLOT="4"
 IUSE="debug"
 
 
-RDEPEND=">=kde-base/libkonq-${KDE_MINIMAL}"
+RDEPEND="
+	$(add_kdebase_dep libkonq)
+"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 "

diff --git a/kde-misc/ksoprano/ksoprano-0.2.ebuild b/kde-misc/ksoprano/ksoprano-0.2.ebuild
index 8e7c12c..9550479 100644
--- a/kde-misc/ksoprano/ksoprano-0.2.ebuild
+++ b/kde-misc/ksoprano/ksoprano-0.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit kde4-base
 
@@ -16,10 +16,10 @@ SLOT="4"
 IUSE="debug"
 
 DEPEND="
-	>=kde-base/kdelibs-${KDE_MINIMAL}[semantic-desktop]
+	$(add_kdebase_dep kdelibs semantic-desktop)
 "
 RDEPEND="${DEPEND}
-	>=kde-base/nepomuk-${KDE_MINIMAL}
+	$(add_kdebase_dep nepomuk)
 "
 
 S="${WORKDIR}/${PN}"

diff --git a/kde-misc/kustodian/kustodian-9999.ebuild b/kde-misc/kustodian/kustodian-9999.ebuild
index 2a113d8..90be43d 100644
--- a/kde-misc/kustodian/kustodian-9999.ebuild
+++ b/kde-misc/kustodian/kustodian-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KMNAME="playground/base/plasma"
 KMMODULE="applets/${PN}"
@@ -17,5 +17,5 @@ SLOT="0"
 IUSE="debug"
 
 RDEPEND="
-	>=kde-base/plasma-workspace-${KDE_MINIMAL}
+	$(add_kdebase_dep plasma-workspace)
 "

diff --git a/kde-misc/kwebkitpart/kwebkitpart-9999.ebuild b/kde-misc/kwebkitpart/kwebkitpart-9999.ebuild
index b9838e9..5bae910 100644
--- a/kde-misc/kwebkitpart/kwebkitpart-9999.ebuild
+++ b/kde-misc/kwebkitpart/kwebkitpart-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KDE_MINIMAL="4.6"
 KDE_SCM="git"

diff --git a/kde-misc/massif-visualizer/massif-visualizer-9999.ebuild b/kde-misc/massif-visualizer/massif-visualizer-9999.ebuild
index 12dcbd7..263f5c2 100644
--- a/kde-misc/massif-visualizer/massif-visualizer-9999.ebuild
+++ b/kde-misc/massif-visualizer/massif-visualizer-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KDE_SCM="git"
 inherit kde4-base

diff --git a/kde-misc/youtube-servicemenu/metadata.xml b/kde-misc/massif-visualizer/metadata.xml
similarity index 100%
copy from kde-misc/youtube-servicemenu/metadata.xml
copy to kde-misc/massif-visualizer/metadata.xml

diff --git a/kde-misc/menubar/menubar-9999.ebuild b/kde-misc/menubar/menubar-9999.ebuild
index fd882d6..d6ee66c 100644
--- a/kde-misc/menubar/menubar-9999.ebuild
+++ b/kde-misc/menubar/menubar-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KMNAME="playground/base/plasma"
 KMMODULE="applets/${PN}"
@@ -18,5 +18,5 @@ IUSE="debug"
 
 RDEPEND="
 	!kde-plasmoids/menubar
-	>=kde-base/plasma-workspace-${KDE_MINIMAL}
+	$(add_kdebase_dep plasma-workspace)
 "

diff --git a/kde-misc/miniplayer/miniplayer-1.0.ebuild b/kde-misc/miniplayer/miniplayer-1.0.ebuild
index 839f626..3154a98 100644
--- a/kde-misc/miniplayer/miniplayer-1.0.ebuild
+++ b/kde-misc/miniplayer/miniplayer-1.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit kde4-base
 
@@ -16,5 +16,5 @@ SLOT="0"
 IUSE="debug"
 
 RDEPEND="
-	>=kde-base/plasma-workspace-${KDE_MINIMAL}
+	$(add_kdebase_dep plasma-workspace)
 "

diff --git a/kde-misc/onelinecalc/onelinecalc-0.2.ebuild b/kde-misc/onelinecalc/onelinecalc-0.2.ebuild
index a4bf621..3ef4648 100644
--- a/kde-misc/onelinecalc/onelinecalc-0.2.ebuild
+++ b/kde-misc/onelinecalc/onelinecalc-0.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit kde4-base
 
@@ -17,7 +17,7 @@ IUSE="debug"
 
 RDEPEND="
 	!kde-plasmoids/onelinecalc
-	>=kde-base/plasma-workspace-${KDE_MINIMAL}
+	$(add_kdebase_dep plasma-workspace)
 "
 
 PATCHES=( "${FILESDIR}/cmake_fix_for_kde-4_2.patch" )

diff --git a/kde-misc/panelspacer/panelspacer-0.2.ebuild b/kde-misc/panelspacer/panelspacer-0.2.ebuild
index dc5266c..f9440ba 100644
--- a/kde-misc/panelspacer/panelspacer-0.2.ebuild
+++ b/kde-misc/panelspacer/panelspacer-0.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit kde4-base
 
@@ -19,7 +19,7 @@ IUSE="debug"
 
 RDEPEND="
 	!kde-plasmoids/panelspacer
-	>=kde-base/plasma-workspace-${KDE_MINIMAL}
+	$(add_kdebase_dep plasma-workspace)
 "
 
 S="${WORKDIR}/${MY_P}"

diff --git a/kde-misc/pgame/pgame-0.3.ebuild b/kde-misc/pgame/pgame-0.3.ebuild
index 1978f08..55a5808 100644
--- a/kde-misc/pgame/pgame-0.3.ebuild
+++ b/kde-misc/pgame/pgame-0.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit kde4-base
 
@@ -17,5 +17,5 @@ IUSE="debug"
 
 RDEPEND="
 	!kde-plasmoids/pgame
-	>=kde-base/plasma-workspace-${KDE_MINIMAL}
+	$(add_kdebase_dep plasma-workspace)
 "

diff --git a/kde-misc/pgame/pgame-0.4.ebuild b/kde-misc/pgame/pgame-0.4.ebuild
index 59edc41..55a5808 100644
--- a/kde-misc/pgame/pgame-0.4.ebuild
+++ b/kde-misc/pgame/pgame-0.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit kde4-base
 
@@ -17,5 +17,5 @@ IUSE="debug"
 
 RDEPEND="
 	!kde-plasmoids/pgame
-	>=kde-base/plasma-workspace-4.2.87
+	$(add_kdebase_dep plasma-workspace)
 "

diff --git a/kde-misc/plasma-emergelog/plasma-emergelog-0.0.1.ebuild b/kde-misc/plasma-emergelog/plasma-emergelog-0.0.1.ebuild
index f62c81e..67b4438 100644
--- a/kde-misc/plasma-emergelog/plasma-emergelog-0.0.1.ebuild
+++ b/kde-misc/plasma-emergelog/plasma-emergelog-0.0.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit kde4-base
 
@@ -16,7 +16,7 @@ SLOT="0"
 IUSE="debug"
 
 RDEPEND="
-	>=kde-base/plasma-workspace-${KDE_MINIMAL}
+	$(add_kdebase_dep plasma-workspace)
 "
 
 pkg_postinst() {

diff --git a/kde-misc/plasma-emergelog/plasma-emergelog-0.0.2.ebuild b/kde-misc/plasma-emergelog/plasma-emergelog-0.0.2.ebuild
index 3260b5c..fc492e9 100644
--- a/kde-misc/plasma-emergelog/plasma-emergelog-0.0.2.ebuild
+++ b/kde-misc/plasma-emergelog/plasma-emergelog-0.0.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit kde4-base
 
@@ -16,7 +16,7 @@ SLOT="0"
 IUSE="debug"
 
 RDEPEND="
-	>=kde-base/plasma-workspace-${KDE_MINIMAL}
+	$(add_kdebase_dep plasma-workspace)
 "
 
 pkg_postinst() {

diff --git a/kde-misc/plasma-emergelog/plasma-emergelog-9999.ebuild b/kde-misc/plasma-emergelog/plasma-emergelog-9999.ebuild
index 84dfe70..c9f614b 100644
--- a/kde-misc/plasma-emergelog/plasma-emergelog-9999.ebuild
+++ b/kde-misc/plasma-emergelog/plasma-emergelog-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KDE_SCM="git"
 inherit kde4-base

diff --git a/kde-misc/plasma-mobile/plasma-mobile-9999.ebuild b/kde-misc/plasma-mobile/plasma-mobile-9999.ebuild
index 3b2e35b..b100fa7 100644
--- a/kde-misc/plasma-mobile/plasma-mobile-9999.ebuild
+++ b/kde-misc/plasma-mobile/plasma-mobile-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KDE_MINIMAL="4.6"
 
@@ -20,7 +20,7 @@ SLOT="4"
 IUSE=""
 
 DEPEND="
-		$(add_kdebase_dep nepomuk)
-		$(add_kdebase_dep plasma-workspace)
+	$(add_kdebase_dep nepomuk)
+	$(add_kdebase_dep plasma-workspace)
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-misc/plasma-widget-menubar/plasma-widget-menubar-0.1.14.ebuild b/kde-misc/plasma-widget-menubar/plasma-widget-menubar-0.1.14.ebuild
index 805fb30..97b0e00 100644
--- a/kde-misc/plasma-widget-menubar/plasma-widget-menubar-0.1.14.ebuild
+++ b/kde-misc/plasma-widget-menubar/plasma-widget-menubar-0.1.14.ebuild
@@ -2,9 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
-inherit virtualx kde4-base
+VIRTUALX_REQUIRED="test"
+inherit kde4-base
 
 DESCRIPTION="A Plasma widget to display menubar of application windows"
 HOMEPAGE="https://launchpad.net/plasma-widget-menubar"
@@ -22,8 +23,3 @@ DEPEND="
 RDEPEND="${DEPEND}
 	!kde-misc/plasma-indicatordisplay
 "
-
-src_test() {
-	export maketype="kde4-base_src_test"
-	virtualmake
-}

diff --git a/kde-misc/plasma-wifi/plasma-wifi-0.5-r1.ebuild b/kde-misc/plasma-wifi/plasma-wifi-0.5-r1.ebuild
index c770578..808daca 100644
--- a/kde-misc/plasma-wifi/plasma-wifi-0.5-r1.ebuild
+++ b/kde-misc/plasma-wifi/plasma-wifi-0.5-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit kde4-base
 
@@ -17,7 +17,7 @@ IUSE="debug"
 
 RDEPEND="
 	!kde-plasmoids/plasma-wifi
-	>=kde-base/plasma-workspace-${KDE_MINIMAL}
+	$(add_kdebase_dep plasma-workspace)
 "
 
 src_prepare() {

diff --git a/kde-misc/playwolf/playwolf-0.7.2.ebuild b/kde-misc/playwolf/playwolf-0.7.2.ebuild
index 92ab97d..0f6e4b5 100644
--- a/kde-misc/playwolf/playwolf-0.7.2.ebuild
+++ b/kde-misc/playwolf/playwolf-0.7.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit kde4-base
 
@@ -19,8 +19,8 @@ IUSE="debug"
 
 RDEPEND="
 	!kde-plasmoids/playwolf
-	>=kde-base/kdelibs-${KDE_MINIMAL}[semantic-desktop]
-	>=kde-base/plasma-workspace-${KDE_MINIMAL}
+	$(add_kdebase_dep kdelibs 'semantic-desktop')
+	$(add_kdebase_dep plasma-workspace)
 "
 
 S="${WORKDIR}/${MY_P}"

diff --git a/kde-misc/polkit-kde-kcmodules/polkit-kde-kcmodules-9999.ebuild b/kde-misc/polkit-kde-kcmodules/polkit-kde-kcmodules-9999.ebuild
index 4f0a987..bab3de2 100644
--- a/kde-misc/polkit-kde-kcmodules/polkit-kde-kcmodules-9999.ebuild
+++ b/kde-misc/polkit-kde-kcmodules/polkit-kde-kcmodules-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 MY_PN="${PN}-1"
 MY_P="${MY_PN}-${PV}"

diff --git a/kde-misc/publictransport/publictransport-0.6.10.ebuild b/kde-misc/publictransport/publictransport-0.6.10.ebuild
index 9e3cdd4..7a51be3 100644
--- a/kde-misc/publictransport/publictransport-0.6.10.ebuild
+++ b/kde-misc/publictransport/publictransport-0.6.10.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit kde4-base
 
@@ -15,7 +15,7 @@ SLOT="4"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
-DEPEND=">=kde-base/plasma-workspace-${KDE_MINIMAL}"
+DEPEND="$(add_kdebase_dep plasma-workspace)"
 RDEPEND="${DEPEND}"
 
 DOCS=(AUTHORS Changelog README)

diff --git a/kde-misc/simplemonitor/simplemonitor-0.1-r4.ebuild b/kde-misc/simplemonitor/simplemonitor-0.1-r4.ebuild
index 247cdaf..c8fc950 100644
--- a/kde-misc/simplemonitor/simplemonitor-0.1-r4.ebuild
+++ b/kde-misc/simplemonitor/simplemonitor-0.1-r4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit kde4-base
 
@@ -19,7 +19,7 @@ IUSE="debug"
 
 RDEPEND="
 	!kde-plasmoids/simplemonitor-plasmoid
-	>=kde-base/plasma-workspace-${KDE_MINIMAL}
+	$(add_kdebase_dep plasma-workspace)
 "
 
 S="${WORKDIR}/${PN}"

diff --git a/kde-misc/simpleweatherforecast/simpleweatherforecast-1.2.ebuild b/kde-misc/simpleweatherforecast/simpleweatherforecast-1.2.ebuild
index 0dc9c36..c80a9a7 100644
--- a/kde-misc/simpleweatherforecast/simpleweatherforecast-1.2.ebuild
+++ b/kde-misc/simpleweatherforecast/simpleweatherforecast-1.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit kde4-base
 
@@ -18,7 +18,7 @@ SLOT="0"
 IUSE="debug"
 
 DEPEND="
-	>=kde-base/plasma-workspace-${KDE_MINIMAL}
+	$(add_kdebase_dep plasma-workspace)
 "
 RDEPEND="${DEPEND}
 	!kde-plasmoids/plasma-weatherforecast

diff --git a/kde-misc/youtube-servicemenu/metadata.xml b/kde-misc/socket-sentry/metadata.xml
similarity index 100%
copy from kde-misc/youtube-servicemenu/metadata.xml
copy to kde-misc/socket-sentry/metadata.xml

diff --git a/kde-misc/socket-sentry/socket-sentry-0.9.3.ebuild b/kde-misc/socket-sentry/socket-sentry-0.9.3.ebuild
index 2caac39..29ea3bd 100644
--- a/kde-misc/socket-sentry/socket-sentry-0.9.3.ebuild
+++ b/kde-misc/socket-sentry/socket-sentry-0.9.3.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
+KDE_MINIMAL=4.5
+KDE_OVERRIDE_MINIMAL=4.5.1
 
 inherit kde4-base
 
@@ -20,6 +22,5 @@ SLOT="0"
 IUSE="debug"
 
 RDEPEND="
-	>=kde-base/kdelibs-4.5.1
 	>=net-libs/libpcap-0.9
 "

diff --git a/kde-misc/stasks/stasks-0.5.1.ebuild b/kde-misc/stasks/stasks-0.5.1.ebuild
index ebbd37a..5fe4631 100644
--- a/kde-misc/stasks/stasks-0.5.1.ebuild
+++ b/kde-misc/stasks/stasks-0.5.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit kde4-base
 
@@ -17,13 +17,9 @@ IUSE="debug"
 
 RDEPEND="
 	!kde-plasmoids/stasks
-	>=kde-base/plasma-workspace-${KDE_MINIMAL}
+	$(add_kdebase_dep plasma-workspace)
 "
 
-src_prepare() {
-	if has_version ">=kde-base/kdelibs-4.2.90"; then
-		epatch "${FILESDIR}"/"${PN}"_kde-4.3.patch
-	fi
-
-	kde4-base_src_prepare
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}_kde-4.3.patch
+)

diff --git a/kde-misc/stdin-plasmoid/stdin-plasmoid-0.2_beta1.ebuild b/kde-misc/stdin-plasmoid/stdin-plasmoid-0.2_beta1.ebuild
index 4b7d78d..7f9a5d1 100644
--- a/kde-misc/stdin-plasmoid/stdin-plasmoid-0.2_beta1.ebuild
+++ b/kde-misc/stdin-plasmoid/stdin-plasmoid-0.2_beta1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit kde4-base versionator
 
@@ -19,7 +19,7 @@ IUSE="debug"
 
 RDEPEND="
 	!kde-plasmoids/stdin-plasmoid
-	>=kde-base/plasma-workspace-${KDE_MINIMAL}
+	$(add_kdebase_dep plasma-workspace)
 "
 
 S="${WORKDIR}/${MY_P}"

diff --git a/kde-misc/todo-list/todo-list-0.4.ebuild b/kde-misc/todo-list/todo-list-0.4.ebuild
index 1f73a65..61eae06 100644
--- a/kde-misc/todo-list/todo-list-0.4.ebuild
+++ b/kde-misc/todo-list/todo-list-0.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit kde4-base
 
@@ -19,7 +19,7 @@ SLOT="0"
 IUSE="debug"
 
 RDEPEND="
-	>=kde-base/plasma-workspace-${KDE_MINIMAL}
+	$(add_kdebase_dep plasma-workspace)
 "
 
 S="${WORKDIR}/${MY_PN}"

diff --git a/kde-misc/toggle-compositing/toggle-compositing-0.2.3.ebuild b/kde-misc/toggle-compositing/toggle-compositing-0.2.3.ebuild
index fbaec14..8d0129f 100644
--- a/kde-misc/toggle-compositing/toggle-compositing-0.2.3.ebuild
+++ b/kde-misc/toggle-compositing/toggle-compositing-0.2.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit kde4-base
 
@@ -19,7 +19,7 @@ IUSE="debug"
 
 RDEPEND="
 	!kde-plasmoids/toggle-compositing
-	>=kde-base/plasma-workspace-${KDE_MINIMAL}
+	$(add_kdebase_dep plasma-workspace)
 "
 
 S="${WORKDIR}/${MY_P}"

diff --git a/kde-misc/translatoid/translatoid-0.9.ebuild b/kde-misc/translatoid/translatoid-0.9.ebuild
index bc40721..efcd4f5 100644
--- a/kde-misc/translatoid/translatoid-0.9.ebuild
+++ b/kde-misc/translatoid/translatoid-0.9.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit kde4-base
 
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
 RDEPEND="
-	>=kde-base/plasma-workspace-${KDE_MINIMAL}
+	$(add_kdebase_dep plasma-workspace)
 "
 
 S="${WORKDIR}/${PN}"

diff --git a/kde-misc/translatoid/translatoid-9999.ebuild b/kde-misc/translatoid/translatoid-9999.ebuild
index 5a91bec..ea7cc22 100644
--- a/kde-misc/translatoid/translatoid-9999.ebuild
+++ b/kde-misc/translatoid/translatoid-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KMNAME="playground/base/plasma/applets"
 inherit kde4-base
@@ -19,7 +19,7 @@ DEPEND="
 	dev-libs/qjson
 "
 RDEPEND="${DEPEND}
-	>=kde-base/plasma-workspace-${KDE_MINIMAL}
+	$(add_kdebase_dep plasma-workspace)
 "
 
 S="${WORKDIR}/${PN}"

diff --git a/kde-misc/yakuake/yakuake-9999.ebuild b/kde-misc/yakuake/yakuake-9999.ebuild
index 3ed30ec..6f0e37c 100644
--- a/kde-misc/yakuake/yakuake-9999.ebuild
+++ b/kde-misc/yakuake/yakuake-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/kde-misc/yakuake/yakuake-2.9.8.ebuild,v 1.2 2011/01/28 08:09:43 scarabeus Exp $
 
-EAPI=3
+EAPI=4
 
 KDE_LINGUAS="ca cs da de el en_GB es et fr ga gl hr it ja ko nb nds nl nn pl pt
 pt_BR ro ru sk sv th tr uk wa zh_CN"

diff --git a/media-gfx/kflickr/kflickr-9999.ebuild b/media-gfx/kflickr/kflickr-9999.ebuild
index 2dfccc0..cafacf2 100644
--- a/media-gfx/kflickr/kflickr-9999.ebuild
+++ b/media-gfx/kflickr/kflickr-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KDE_LINGUAS="ar bg ca cs de es eu fr he hu id it ko ku lv nb nds nl pl pt_BR
 	ru sl sr sv tr uk zh_CN"

diff --git a/media-gfx/lprof/lprof-1.12_p20091229.ebuild b/media-gfx/lprof/lprof-1.12_p20091229.ebuild
index 6a8dd56..bf0f858 100644
--- a/media-gfx/lprof/lprof-1.12_p20091229.ebuild
+++ b/media-gfx/lprof/lprof-1.12_p20091229.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit cmake-utils
 

diff --git a/media-libs/gluon/gluon-9999.ebuild b/media-libs/gluon/gluon-9999.ebuild
index b491907..8f4d19d 100644
--- a/media-libs/gluon/gluon-9999.ebuild
+++ b/media-libs/gluon/gluon-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 OPENGL_REQUIRED="always"
 KDE_SCM="git"

diff --git a/media-libs/liblastfm/liblastfm-9999.ebuild b/media-libs/liblastfm/liblastfm-9999.ebuild
index 58f30e7..bffc04e 100644
--- a/media-libs/liblastfm/liblastfm-9999.ebuild
+++ b/media-libs/liblastfm/liblastfm-9999.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
-inherit multilib git
+inherit multilib git-2
 
 DESCRIPTION="Collection of libraries to integrate Last.fm services"
 HOMEPAGE="http://github.com/mxcl/liblastfm/"
@@ -36,11 +36,5 @@ src_prepare() {
 }
 
 src_configure() {
-	./configure --prefix "${ROOT}usr" --no-strip --release || die "configure failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}${ROOT}" install || die "emake install failed"
-
-	dodoc README || die "dodoc failed"
+	./configure --prefix /usr --no-strip --release || die "configure failed"
 }

diff --git a/media-libs/opengtl/opengtl-0.9.8.ebuild b/media-libs/opengtl/opengtl-0.9.8.ebuild
index f039317..fc21d1e 100644
--- a/media-libs/opengtl/opengtl-0.9.8.ebuild
+++ b/media-libs/opengtl/opengtl-0.9.8.ebuild
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI=4
+
 inherit cmake-utils
 
 DESCRIPTION="Set of libraries for using and integrating transformation algorithms"

diff --git a/media-libs/opengtl/opengtl-0.9.9.ebuild b/media-libs/opengtl/opengtl-0.9.9.ebuild
index 96d947c..0ffffac 100644
--- a/media-libs/opengtl/opengtl-0.9.9.ebuild
+++ b/media-libs/opengtl/opengtl-0.9.9.ebuild
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI=4
+
 inherit cmake-utils
 
 DESCRIPTION="Set of libraries for using and integrating transformation algorithms"

diff --git a/media-libs/taglib-extras/taglib-extras-9999.ebuild b/media-libs/taglib-extras/taglib-extras-9999.ebuild
index bd74c52..7b06227 100644
--- a/media-libs/taglib-extras/taglib-extras-9999.ebuild
+++ b/media-libs/taglib-extras/taglib-extras-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KMNAME="kdesupport"
 KDE_REQUIRED="optional"

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index fbbebf0..d91a37e 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -2,25 +2,23 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
-# Translations are only in the tarballs, not the git repo
+KDE_LINGUAS="bg ca cs da de en_GB es et eu fi fr it ja km nb nds nl pa
+pl pt pt_BR ru sl sr sr@latin sv th tr uk wa zh_TW"
+KDE_SCM="git"
+KDE_REQUIRED="never"
+inherit flag-o-matic kde4-base
+
+DESCRIPTION="Advanced audio player based on KDE framework."
+HOMEPAGE="http://amarok.kde.org/"
 if [[ ${PV} != *9999* ]]; then
-	KDE_LINGUAS="bg ca cs da de en_GB es et eu fi fr it ja km nb nds nl
-	pa pl pt pt_BR ru sl sr sr@latin sv th tr uk wa zh_TW"
 	SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 else
-	KDE_SCM="git"
 	KEYWORDS=""
 fi
 
-KDE_REQUIRED="never"
-inherit flag-o-matic kde4-base
-
-DESCRIPTION="Advanced audio player based on KDE framework."
-HOMEPAGE="http://amarok.kde.org/"
-
 LICENSE="GPL-2"
 SLOT="4"
 IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp opengl +player semantic-desktop +utils"
@@ -97,6 +95,7 @@ src_prepare() {
 src_configure() {
 	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
 	use ppc64 && append-flags -mminimal-toc
+	local mycmakeargs
 
 	if use player; then
 		mycmakeargs=(

diff --git a/media-sound/kaudiocreator/kaudiocreator-9999.ebuild b/media-sound/kaudiocreator/kaudiocreator-9999.ebuild
index 2742b97..6bb0c4e 100644
--- a/media-sound/kaudiocreator/kaudiocreator-9999.ebuild
+++ b/media-sound/kaudiocreator/kaudiocreator-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KMNAME="extragear/multimedia"
 inherit kde4-base
@@ -16,8 +16,8 @@ SLOT="0"
 IUSE="debug"
 
 DEPEND="
-	>=kde-base/libkcddb-${KDE_MINIMAL}
-	>=kde-base/libkcompactdisc-${KDE_MINIMAL}
+	$(add_kdebase_dep libkcddb)
+	$(add_kdebase_dep libkcompactdisc)
 	media-libs/libdiscid
 	media-libs/taglib
 "

diff --git a/media-sound/kguitar/kguitar-9999.ebuild b/media-sound/kguitar/kguitar-9999.ebuild
index 865888a..3114f4f 100644
--- a/media-sound/kguitar/kguitar-9999.ebuild
+++ b/media-sound/kguitar/kguitar-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 KDE_LINGUAS="de es it fr ru"
 
 inherit kde4-base subversion
@@ -20,6 +20,6 @@ DEPEND="midi? ( >=media-libs/tse3-0.3.0 )"
 RDEPEND="${DEPEND}"
 
 src_configure() {
-	local mycmakeargs=( "$(cmake-utils_use midi WITH_TSE3)" )
+	local mycmakeargs=( $(cmake-utils_use midi WITH_TSE3) )
 	kde4-base_src_configure
 }

diff --git a/media-sound/kradio/kradio-9999.ebuild b/media-sound/kradio/kradio-9999.ebuild
index 1b0fd2e..1487605 100644
--- a/media-sound/kradio/kradio-9999.ebuild
+++ b/media-sound/kradio/kradio-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KDE_LINGUAS="cs de es pl pt ru uk"
 inherit kde4-base

diff --git a/kde-misc/youtube-servicemenu/metadata.xml b/media-sound/qt-gstreamer/metadata.xml
similarity index 100%
copy from kde-misc/youtube-servicemenu/metadata.xml
copy to media-sound/qt-gstreamer/metadata.xml

diff --git a/media-sound/qt-gstreamer/qt-gstreamer-0.10.1.ebuild b/media-sound/qt-gstreamer/qt-gstreamer-0.10.1.ebuild
index df50bc1..04d3ca3 100644
--- a/media-sound/qt-gstreamer/qt-gstreamer-0.10.1.ebuild
+++ b/media-sound/qt-gstreamer/qt-gstreamer-0.10.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit cmake-utils
 

diff --git a/media-sound/qt-gstreamer/qt-gstreamer-9999.ebuild b/media-sound/qt-gstreamer/qt-gstreamer-9999.ebuild
index f8b6375..3ba2a84 100644
--- a/media-sound/qt-gstreamer/qt-gstreamer-9999.ebuild
+++ b/media-sound/qt-gstreamer/qt-gstreamer-9999.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
-inherit cmake-utils git
+inherit cmake-utils git-2
 
 DESCRIPTION="QtGStreamer provides C++ bindings for GStreamer with a Qt-style API."
 HOMEPAGE="http://gstreamer.freedesktop.org/wiki/QtGStreamer"

diff --git a/media-video/bangarang/bangarang-9999.ebuild b/media-video/bangarang/bangarang-9999.ebuild
index 78fbf9d..20503ab 100644
--- a/media-video/bangarang/bangarang-9999.ebuild
+++ b/media-video/bangarang/bangarang-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KDE_LINGUAS="cs de fr it nl pl pt_BR zh_CN"
 KDE_SCM="git"
@@ -18,7 +18,7 @@ SLOT="4"
 IUSE="debug"
 
 RDEPEND="
-	>=kde-base/kdelibs-${KDE_MINIMAL}[semantic-desktop]
+	$(add_kdebase_dep kdelibs 'semantic-desktop')
 	media-libs/taglib
 	media-libs/phonon
 "

diff --git a/media-video/kamoso/kamoso-9999.ebuild b/media-video/kamoso/kamoso-9999.ebuild
index f4724e2..6724cf3 100644
--- a/media-video/kamoso/kamoso-9999.ebuild
+++ b/media-video/kamoso/kamoso-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KDE_SCM="git"
 inherit kde4-base

diff --git a/media-video/kmplayer/kmplayer-9999.ebuild b/media-video/kmplayer/kmplayer-9999.ebuild
index 211c035..221978e 100644
--- a/media-video/kmplayer/kmplayer-9999.ebuild
+++ b/media-video/kmplayer/kmplayer-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KMNAME="extragear/multimedia"
 inherit kde4-base

diff --git a/media-video/recorditnow/metadata.xml b/media-video/recorditnow/metadata.xml
index 7e32869..3666795 100644
--- a/media-video/recorditnow/metadata.xml
+++ b/media-video/recorditnow/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>maintainer-wanted</herd>
+<herd>no-herd</herd>
+<maintainer>
+  <email>maintainer-wanted@g.o</email>
+</maintainer>
 </pkgmetadata>

diff --git a/media-video/recorditnow/recorditnow-0.4.ebuild b/media-video/recorditnow/recorditnow-0.4.ebuild
index 47d6ad5..8545693 100644
--- a/media-video/recorditnow/recorditnow-0.4.ebuild
+++ b/media-video/recorditnow/recorditnow-0.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 #KDE_LINGUAS="en cs de hu pt_BR"
 # need patch to work select linguas

diff --git a/media-video/recorditnow/recorditnow-9999.ebuild b/media-video/recorditnow/recorditnow-9999.ebuild
index bc6fcff..81aa712 100644
--- a/media-video/recorditnow/recorditnow-9999.ebuild
+++ b/media-video/recorditnow/recorditnow-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 #KDE_LINGUAS="en cs de hu pt_BR fr"
 # need patch to work select linguas

diff --git a/media-video/subtitlecomposer/subtitlecomposer-9999.ebuild b/media-video/subtitlecomposer/subtitlecomposer-9999.ebuild
index d016f4f..068c9d7 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-9999.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KDE_LINGUAS="bg cs de el es fr it pl pt_BR sr"
 inherit kde4-base

diff --git a/net-im/choqok/choqok-9999.ebuild b/net-im/choqok/choqok-9999.ebuild
index 601891d..fc9f807 100644
--- a/net-im/choqok/choqok-9999.ebuild
+++ b/net-im/choqok/choqok-9999.ebuild
@@ -2,15 +2,15 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
+KDE_LINGUAS="bg da de en_GB es et fr ja nb nds nl pa pl pt pt_BR ru sv tr uk zh_CN zh_TW"
+KDE_SCM="git"
 if [[ ${PV} != *9999* ]]; then
-	KDE_LINGUAS="bg da de en_GB es et fr ja nb nds nl pa pl pt pt_BR ru sv tr uk zh_CN zh_TW"
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 	KDE_HANDBOOK="optional"
 	KEYWORDS="~amd64 ~x86"
 else
-	KDE_SCM="git"
 	KEYWORDS=""
 fi
 

diff --git a/net-irc/aki/aki-9999.ebuild b/net-irc/aki/aki-9999.ebuild
index ec65fae..7a6a440 100644
--- a/net-irc/aki/aki-9999.ebuild
+++ b/net-irc/aki/aki-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 WEBKIT_REQUIRED="always"
 KDE_SCM="git"

diff --git a/net-irc/konversation/konversation-9999.ebuild b/net-irc/konversation/konversation-9999.ebuild
index b5415a1..a5c0ae3 100644
--- a/net-irc/konversation/konversation-9999.ebuild
+++ b/net-irc/konversation/konversation-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KDE_SCM="git"
 inherit kde4-base

diff --git a/net-libs/libbluedevil/libbluedevil-9999.ebuild b/net-libs/libbluedevil/libbluedevil-9999.ebuild
index 2117041..3019cf0 100644
--- a/net-libs/libbluedevil/libbluedevil-9999.ebuild
+++ b/net-libs/libbluedevil/libbluedevil-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KDE_SCM="git"
 inherit kde4-base

diff --git a/net-libs/libgcal/libgcal-9999.ebuild b/net-libs/libgcal/libgcal-9999.ebuild
index 873997a..ffccdb8 100644
--- a/net-libs/libgcal/libgcal-9999.ebuild
+++ b/net-libs/libgcal/libgcal-9999.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
-inherit cmake-utils git
+inherit cmake-utils git-2
 
 DESCRIPTION="C/C++ interface to the Google Data API"
 HOMEPAGE="http://code.google.com/p/libgcal/"

diff --git a/net-libs/libktorrent/libktorrent-9999.ebuild b/net-libs/libktorrent/libktorrent-9999.ebuild
index f7253e1..5ea9b09 100644
--- a/net-libs/libktorrent/libktorrent-9999.ebuild
+++ b/net-libs/libktorrent/libktorrent-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-libs/libktorrent/libktorrent-1.0.5.3.ebuild,v 1.5 2011/01/17 01:07:43 ranger Exp $
 
-EAPI=3
+EAPI=4
 
 KDE_SCM="git"
 if [[ ${PV} != 9999* ]]; then

diff --git a/net-libs/libqinfinity/libqinfinity-1.0_beta5.ebuild b/net-libs/libqinfinity/libqinfinity-1.0_beta5.ebuild
index 27cd873..ba84d89 100644
--- a/net-libs/libqinfinity/libqinfinity-1.0_beta5.ebuild
+++ b/net-libs/libqinfinity/libqinfinity-1.0_beta5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit cmake-utils
 

diff --git a/net-libs/likeback/likeback-9999.ebuild b/net-libs/likeback/likeback-9999.ebuild
index f3c6036..bbb88ae 100644
--- a/net-libs/likeback/likeback-9999.ebuild
+++ b/net-libs/likeback/likeback-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KDE_SCM="git"
 inherit kde4-base
@@ -15,8 +15,3 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 IUSE=""
-
-DEPEND="
-	>=kde-base/kdelibs-${KDE_MINIMAL}
-"
-RDEPEND="${DEPEND}"

diff --git a/kde-misc/youtube-servicemenu/metadata.xml b/net-libs/likeback/metadata.xml
similarity index 100%
rename from kde-misc/youtube-servicemenu/metadata.xml
rename to net-libs/likeback/metadata.xml

diff --git a/net-p2p/ktorrent/ktorrent-9999.ebuild b/net-p2p/ktorrent/ktorrent-9999.ebuild
index 7366758..d4feb89 100644
--- a/net-p2p/ktorrent/ktorrent-9999.ebuild
+++ b/net-p2p/ktorrent/ktorrent-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ktorrent-4.0.5.ebuild,v 1.6 2011/01/17 01:08:40 ranger Exp $
 
-EAPI=3
+EAPI=4
 
 KDE_SCM="git"
 KDE_MINIMAL="4.5"
@@ -12,7 +12,7 @@ if [[ ${PV} != 9999* ]]; then
 	inherit versionator
 	# upstream likes to skip that _ in beta releases
 	MY_PV="${PV/_/}"
-	LIBKT_VERSION_MIN=$(($(get_major_version)-3)).$(get_version_component_range 2-3 ${PV})
+	LIBKT_VERSION_MIN=$(($(get_major_version)-3)).$(get_version_component_range 2-3)
 	LIBKT_VERSION_MAX=$(($(get_major_version)-3)).$(($(get_version_component_range 2)+1))
 	MY_P="${PN}-${MY_PV}"
 	KDE_HANDBOOK="optional"

diff --git a/net-wireless/bluedevil/bluedevil-9999.ebuild b/net-wireless/bluedevil/bluedevil-9999.ebuild
index 0044ca8..99098bf 100644
--- a/net-wireless/bluedevil/bluedevil-9999.ebuild
+++ b/net-wireless/bluedevil/bluedevil-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 EGIT_REPONAME="bluedevil"
 KDE_SCM="git"

diff --git a/sys-auth/kdm-plugin-pam-face-authentication/kdm-plugin-pam-face-authentication-0.2.ebuild b/sys-auth/kdm-plugin-pam-face-authentication/kdm-plugin-pam-face-authentication-0.2.ebuild
index c7cdb65..81ca884 100644
--- a/sys-auth/kdm-plugin-pam-face-authentication/kdm-plugin-pam-face-authentication-0.2.ebuild
+++ b/sys-auth/kdm-plugin-pam-face-authentication/kdm-plugin-pam-face-authentication-0.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit kde4-base
 

diff --git a/sys-auth/nss-mdns/nss-mdns-0.10-r1.ebuild b/sys-auth/nss-mdns/nss-mdns-0.10-r1.ebuild
index 8df5212..79c4703 100644
--- a/sys-auth/nss-mdns/nss-mdns-0.10-r1.ebuild
+++ b/sys-auth/nss-mdns/nss-mdns-0.10-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit autotools eutils
 
@@ -29,21 +29,14 @@ src_configure() {
 	econf \
 		--enable-avahi \
 		--disable-legacy \
-		$(use_enable search-domains) \
-		|| die "configure failed"
-}
-
-src_compile() {
-	emake || die "compile failed"
+		$(use_enable search-domains)
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "install failed"
+	default
 
 	insinto /etc
 	doins "${FILESDIR}"/mdns.allow
-
-	dodoc README
 }
 
 pkg_postinst() {

diff --git a/sys-auth/pam-face-authentication/pam-face-authentication-0.3.ebuild b/sys-auth/pam-face-authentication/pam-face-authentication-0.3.ebuild
index b528a01..919e264 100644
--- a/sys-auth/pam-face-authentication/pam-face-authentication-0.3.ebuild
+++ b/sys-auth/pam-face-authentication/pam-face-authentication-0.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit cmake-utils
 

diff --git a/sys-auth/polkit-kde-agent/polkit-kde-agent-9999.ebuild b/sys-auth/polkit-kde-agent/polkit-kde-agent-9999.ebuild
index af649c6..baf2cae 100644
--- a/sys-auth/polkit-kde-agent/polkit-kde-agent-9999.ebuild
+++ b/sys-auth/polkit-kde-agent/polkit-kde-agent-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KDE_LINGUAS="da en_GB et gl lt nl pt pt_BR sk sv uk zh_TW"
 MY_PN=${PN}-1

diff --git a/sys-auth/polkit-qt/polkit-qt-9999.ebuild b/sys-auth/polkit-qt/polkit-qt-9999.ebuild
index dfff03e..364aa01 100644
--- a/sys-auth/polkit-qt/polkit-qt-9999.ebuild
+++ b/sys-auth/polkit-qt/polkit-qt-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit cmake-utils git-2
 

diff --git a/sys-block/kvpm/kvpm-0.7.1.ebuild b/sys-block/kvpm/kvpm-0.7.1.ebuild
index c16a10e..cf83ebe 100644
--- a/sys-block/kvpm/kvpm-0.7.1.ebuild
+++ b/sys-block/kvpm/kvpm-0.7.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit kde4-base
 

diff --git a/sys-block/partitionmanager/partitionmanager-9999.ebuild b/sys-block/partitionmanager/partitionmanager-9999.ebuild
index b3d20b3..cb7ade7 100644
--- a/sys-block/partitionmanager/partitionmanager-9999.ebuild
+++ b/sys-block/partitionmanager/partitionmanager-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KMNAME="extragear/sysadmin"
 inherit kde4-base

diff --git a/www-client/rekonq/rekonq-9999.ebuild b/www-client/rekonq/rekonq-9999.ebuild
index e7e6d57..959b5d8 100644
--- a/www-client/rekonq/rekonq-9999.ebuild
+++ b/www-client/rekonq/rekonq-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 WEBKIT_REQUIRED=always
 QT_MINIMAL="4.7"

diff --git a/x11-libs/qtscriptgenerator/qtscriptgenerator-9999.ebuild b/x11-libs/qtscriptgenerator/qtscriptgenerator-9999.ebuild
index 5e71434..1a111ce 100644
--- a/x11-libs/qtscriptgenerator/qtscriptgenerator-9999.ebuild
+++ b/x11-libs/qtscriptgenerator/qtscriptgenerator-9999.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
-inherit multilib git qt4
+inherit multilib qt4-r2 git-2
 
 DESCRIPTION="Tool for generating Qt bindings for Qt Script"
 HOMEPAGE="http://code.google.com/p/qtscriptgenerator/"
@@ -26,10 +26,6 @@ RDEPEND="${DEPEND}"
 
 PLUGINS="core gui network opengl sql svg uitools webkit xml xmlpatterns"
 
-src_unpack() {
-	git_src_unpack
-}
-
 src_prepare() {
 	# remove phonon
 	sed -i "/typesystem_phonon.xml/d" generator/generator.qrc \
@@ -38,8 +34,7 @@ src_prepare() {
 		|| die "sed failed"
 
 	epatch "${FILESDIR}/${PN}-gcc44.patch"
-	git_src_prepare
-	qt4_src_prepare
+	qt4-r2_src_prepare
 }
 
 src_configure() {
@@ -51,11 +46,11 @@ src_configure() {
 
 src_compile() {
 	cd "${S}"/generator
-	emake || die "emake generator failed"
-	./generator --include-paths="/usr/include/qt4/" || die "running generator failed"
+	emake
+	./generator --include-paths="${EPREFIX}/usr/include/qt4/" || die "running generator failed"
 
 	cd "${S}"/qtbindings
-	emake || die "make qtbindings failed"
+	emake
 }
 
 src_install() {

diff --git a/x11-misc/wmiface/wmiface-2.1.ebuild b/x11-misc/wmiface/wmiface-2.1.ebuild
index 98c33a4..fa3344d 100644
--- a/x11-misc/wmiface/wmiface-2.1.ebuild
+++ b/x11-misc/wmiface/wmiface-2.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit cmake-utils
 

diff --git a/x11-themes/bespin/bespin-9999.ebuild b/x11-themes/bespin/bespin-9999.ebuild
index 623eae7..079f4b1 100644
--- a/x11-themes/bespin/bespin-9999.ebuild
+++ b/x11-themes/bespin/bespin-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit kde4-base
 

diff --git a/x11-themes/oxygen-gtk/oxygen-gtk-9999.ebuild b/x11-themes/oxygen-gtk/oxygen-gtk-9999.ebuild
index ea32f44..23fd418 100644
--- a/x11-themes/oxygen-gtk/oxygen-gtk-9999.ebuild
+++ b/x11-themes/oxygen-gtk/oxygen-gtk-9999.ebuild
@@ -38,7 +38,8 @@ src_install() {
 	cmake-utils_src_install
 
 	cat <<-EOF > 99oxygen-gtk
-CONFIG_PROTECT="${EPREFIX}/usr/share/themes/oxygen-gtk/gtk-2.0"
+CONFIG_PROTECT="/usr/share/themes/oxygen-gtk/gtk-2.0"
 EOF
 	doenvd 99oxygen-gtk
 }
+