[gentoo-commits] proj/kde:master commit in: kde-base/kwalletd/, kde-base/libplasmagenericshell/, kde-base/libtaskmanager/, ...

[Jonathan Callen]

commit:     bf9293c2ec0b9aafece15af4373ad42e0ceea414
Author:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
AuthorDate: Tue May 31 02:09:36 2011 +0000
Commit:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
CommitDate: Tue May 31 02:09:36 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=bf9293c2

[kde-base] General cleanup, remove some conditionals from :live (as we want the :live version for 4.7 now as well)

(Portage version: 2.2.0_alpha35/git/Linux x86_64, signed Manifest commit with key 229E5838)

---
 .../activitymanager/activitymanager-9999.ebuild    |    6 ++++-
 kde-base/attica/attica-9999.ebuild                 |    2 +-
 kde-base/blinken/blinken-4.6.80.ebuild             |    2 -
 kde-base/blinken/blinken-9999.ebuild               |   12 +--------
 kde-base/cantor/cantor-9999.ebuild                 |   12 ++-------
 kde-base/dolphin/dolphin-9999.ebuild               |    2 +-
 kde-base/drkonqi/drkonqi-9999.ebuild               |    2 +-
 .../freespacenotifier-9999.ebuild                  |    2 +-
 kde-base/gwenview/gwenview-9999.ebuild             |   14 +++--------
 kde-base/kalgebra/kalgebra-4.6.80.ebuild           |    4 +--
 kde-base/kalgebra/kalgebra-9999.ebuild             |   21 +++-------------
 kde-base/kalzium/kalzium-4.6.80.ebuild             |    2 +-
 kde-base/kalzium/kalzium-9999.ebuild               |   10 +------
 kde-base/kamera/kamera-4.6.80.ebuild               |   12 ---------
 kde-base/kamera/kamera-9999.ebuild                 |   22 +----------------
 kde-base/kanagram/kanagram-4.6.80.ebuild           |    4 ---
 kde-base/kanagram/kanagram-9999.ebuild             |   12 +--------
 kde-base/kate/kate-9999.ebuild                     |    3 +-
 kde-base/kbruch/kbruch-9999.ebuild                 |    8 +-----
 kde-base/kcheckpass/kcheckpass-9999.ebuild         |    2 +-
 kde-base/kcminit/kcminit-9999.ebuild               |    2 +-
 kde-base/kcmshell/kcmshell-9999.ebuild             |    2 +-
 kde-base/kcolorchooser/kcolorchooser-9999.ebuild   |    8 +-----
 kde-base/kcontrol/kcontrol-9999.ebuild             |    2 +-
 .../kdebase-cursors/kdebase-cursors-4.6.80.ebuild  |    3 +-
 .../kdebase-cursors-4.6.9999.ebuild                |    3 +-
 .../kdebase-cursors/kdebase-cursors-9999.ebuild    |    5 +--
 kde-base/kdebase-data/kdebase-data-9999.ebuild     |    2 +-
 .../kdebase-desktoptheme-9999.ebuild               |    2 +-
 .../kdebase-kioslaves-9999.ebuild                  |    2 +-
 .../kdebase-menu-icons-9999.ebuild                 |    2 +-
 kde-base/kdebase-menu/kdebase-menu-9999.ebuild     |    2 +-
 .../kdebase-startkde/kdebase-startkde-9999.ebuild  |    2 +-
 kde-base/kdebugdialog/kdebugdialog-9999.ebuild     |    2 +-
 .../kdegraphics-strigi-analyzer-4.6.80.ebuild      |    6 ----
 .../kdegraphics-strigi-analyzer-9999.ebuild        |   15 +-----------
 kde-base/kdepasswd/kdepasswd-9999.ebuild           |    2 +-
 kde-base/kdesu/kdesu-9999.ebuild                   |    2 +-
 kde-base/kdialog/kdialog-9999.ebuild               |    2 +-
 kde-base/kdm/kdm-9999.ebuild                       |    2 +-
 .../kdontchangethehostname-9999.ebuild             |    2 +-
 kde-base/keditbookmarks/keditbookmarks-9999.ebuild |    2 +-
 kde-base/keditfiletype/keditfiletype-9999.ebuild   |    2 +-
 kde-base/kephal/kephal-9999.ebuild                 |    2 +-
 kde-base/kfile/kfile-9999.ebuild                   |    2 +-
 kde-base/kfind/kfind-9999.ebuild                   |    2 +-
 kde-base/kfmclient/kfmclient-9999.ebuild           |    2 +-
 kde-base/kgamma/kgamma-4.6.80.ebuild               |    8 ------
 kde-base/kgamma/kgamma-9999.ebuild                 |   16 +------------
 kde-base/kgeography/kgeography-9999.ebuild         |    8 +-----
 kde-base/kglobalaccel/kglobalaccel-9999.ebuild     |    2 +-
 kde-base/khangman/khangman-4.6.80.ebuild           |    4 ---
 kde-base/khangman/khangman-9999.ebuild             |   12 +--------
 kde-base/khelpcenter/khelpcenter-9999.ebuild       |    2 +-
 kde-base/khotkeys/khotkeys-9999.ebuild             |    2 +-
 kde-base/kiconfinder/kiconfinder-9999.ebuild       |    2 +-
 kde-base/kig/kig-9999.ebuild                       |   10 +------
 kde-base/kinfocenter/kinfocenter-9999.ebuild       |    2 +-
 kde-base/kioclient/kioclient-9999.ebuild           |    2 +-
 kde-base/kiten/kiten-9999.ebuild                   |    8 +-----
 kde-base/klettres/klettres-9999.ebuild             |    8 +-----
 kde-base/klipper/klipper-9999.ebuild               |    2 +-
 kde-base/kmenuedit/kmenuedit-9999.ebuild           |    2 +-
 .../kmimetypefinder/kmimetypefinder-9999.ebuild    |    2 +-
 kde-base/kmplot/kmplot-9999.ebuild                 |    8 +-----
 kde-base/knetattach/knetattach-9999.ebuild         |    2 +-
 kde-base/knewstuff/knewstuff-9999.ebuild           |    2 +-
 kde-base/knotify/knotify-9999.ebuild               |    2 +-
 kde-base/kolourpaint/kolourpaint-9999.ebuild       |    8 +-----
 kde-base/konq-plugins/konq-plugins-9999.ebuild     |    2 +-
 kde-base/konqueror/konqueror-9999.ebuild           |    2 +-
 kde-base/konsole/konsole-9999.ebuild               |    2 +-
 kde-base/kpasswdserver/kpasswdserver-9999.ebuild   |    2 +-
 kde-base/kquitapp/kquitapp-9999.ebuild             |    2 +-
 kde-base/kreadconfig/kreadconfig-9999.ebuild       |    2 +-
 kde-base/kruler/kruler-9999.ebuild                 |    8 +-----
 kde-base/krunner/krunner-9999.ebuild               |    2 +-
 kde-base/kscreensaver/kscreensaver-9999.ebuild     |    2 +-
 kde-base/ksmserver/ksmserver-9999.ebuild           |    2 +-
 kde-base/ksnapshot/ksnapshot-9999.ebuild           |   10 +------
 kde-base/ksplash/ksplash-9999.ebuild               |    2 +-
 kde-base/kstart/kstart-9999.ebuild                 |    2 +-
 kde-base/kstartupconfig/kstartupconfig-9999.ebuild |    2 +-
 kde-base/kstyles/kstyles-9999.ebuild               |    2 +-
 kde-base/ksysguard/ksysguard-9999.ebuild           |    2 +-
 kde-base/ksystraycmd/ksystraycmd-9999.ebuild       |    2 +-
 kde-base/ktimezoned/ktimezoned-9999.ebuild         |    2 +-
 kde-base/ktouch/ktouch-9999.ebuild                 |    8 +-----
 kde-base/ktraderclient/ktraderclient-9999.ebuild   |    2 +-
 kde-base/kturtle/kturtle-9999.ebuild               |    8 +-----
 kde-base/kuiserver/kuiserver-9999.ebuild           |    2 +-
 .../kurifilter-plugins-9999.ebuild                 |    2 +-
 kde-base/kwalletd/kwalletd-9999.ebuild             |    2 +-
 kde-base/kwin/kwin-9999.ebuild                     |    2 +-
 kde-base/kwordquiz/kwordquiz-4.6.80.ebuild         |    3 --
 kde-base/kwordquiz/kwordquiz-9999.ebuild           |   11 +--------
 kde-base/kwrite/kwrite-9999.ebuild                 |    2 +-
 kde-base/kwrited/kwrited-9999.ebuild               |    2 +-
 kde-base/libkdcraw/libkdcraw-9999.ebuild           |    9 +------
 kde-base/libkdeedu/libkdeedu-4.6.80.ebuild         |    1 +
 kde-base/libkdeedu/libkdeedu-9999.ebuild           |   10 +------
 kde-base/libkexiv2/libkexiv2-9999.ebuild           |    9 +------
 kde-base/libkipi/libkipi-9999.ebuild               |    9 +------
 kde-base/libkonq/libkonq-9999.ebuild               |    2 +-
 kde-base/libksane/libksane-9999.ebuild             |   19 +--------------
 kde-base/libkworkspace/libkworkspace-9999.ebuild   |    2 +-
 kde-base/liboxygenstyle/liboxygenstyle-9999.ebuild |    2 +-
 kde-base/libplasmaclock/libplasmaclock-9999.ebuild |    2 +-
 .../libplasmagenericshell-9999.ebuild              |    2 +-
 kde-base/libtaskmanager/libtaskmanager-9999.ebuild |    2 +-
 kde-base/marble/marble-9999.ebuild                 |   16 ++++--------
 kde-base/nepomuk/nepomuk-9999.ebuild               |    2 +-
 kde-base/nsplugins/nsplugins-9999.ebuild           |    2 +-
 kde-base/parley/parley-9999.ebuild                 |   10 +------
 kde-base/phonon-kde/phonon-kde-9999.ebuild         |    2 +-
 kde-base/plasma-apps/plasma-apps-9999.ebuild       |    2 +-
 kde-base/plasma-runtime/plasma-runtime-9999.ebuild |    2 +-
 .../plasma-workspace/plasma-workspace-9999.ebuild  |    2 +-
 kde-base/powerdevil/powerdevil-9999.ebuild         |    2 +-
 kde-base/pykde4/pykde4-4.6.80.ebuild               |    2 +-
 kde-base/pykde4/pykde4-9999.ebuild                 |   25 +++++++------------
 .../qguiplatformplugin_kde-9999.ebuild             |    2 +-
 .../renamedlg-plugins-9999.ebuild                  |    2 +-
 kde-base/rocs/rocs-9999.ebuild                     |    8 +-----
 kde-base/solid-runtime/solid-runtime-9999.ebuild   |    2 +-
 kde-base/solid/solid-9999.ebuild                   |    2 +-
 kde-base/step/step-9999.ebuild                     |   11 +-------
 kde-base/svgpart/svgpart-9999.ebuild               |    8 +-----
 kde-base/systemsettings/systemsettings-9999.ebuild |    2 +-
 kde-base/thumbnailers/thumbnailers-4.6.80.ebuild   |    5 +--
 kde-base/thumbnailers/thumbnailers-9999.ebuild     |   16 +-----------
 131 files changed, 159 insertions(+), 479 deletions(-)

diff --git a/kde-base/activitymanager/activitymanager-9999.ebuild b/kde-base/activitymanager/activitymanager-9999.ebuild
index b037d73..193152f 100644
--- a/kde-base/activitymanager/activitymanager-9999.ebuild
+++ b/kde-base/activitymanager/activitymanager-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-runtime"
+KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="Activity manager"
@@ -14,6 +14,10 @@ IUSE="debug semantic-desktop"
 DEPEND="$(add_kdebase_dep kdelibs 'semantic-desktop=')"
 RDEPEND=${DEPEND}
 
+KMEXTRACTONLY="
+	nepomuk/
+"
+
 src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_with semantic-desktop Nepomuk)

diff --git a/kde-base/attica/attica-9999.ebuild b/kde-base/attica/attica-9999.ebuild
index 547064a..d3d5dec 100644
--- a/kde-base/attica/attica-9999.ebuild
+++ b/kde-base/attica/attica-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-runtime"
+KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="Open Collaboration Services provider management"

diff --git a/kde-base/blinken/blinken-4.6.80.ebuild b/kde-base/blinken/blinken-4.6.80.ebuild
index f279ed0..a25c7eb 100644
--- a/kde-base/blinken/blinken-4.6.80.ebuild
+++ b/kde-base/blinken/blinken-4.6.80.ebuild
@@ -18,5 +18,3 @@ DEPEND="
 RDEPEND="${DEPEND}
 	$(add_kdebase_dep knotify)
 "
-
-KMEXTRACTONLY="libkdeedu/kdeeduui"

diff --git a/kde-base/blinken/blinken-9999.ebuild b/kde-base/blinken/blinken-9999.ebuild
index 6123a92..b900402 100644
--- a/kde-base/blinken/blinken-9999.ebuild
+++ b/kde-base/blinken/blinken-9999.ebuild
@@ -5,14 +5,8 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-if [[ ${PV} == *9999 ]]; then
-	KDE_SCM="git"
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeedu"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
+KDE_SCM="git"
+inherit kde4-base
 
 DESCRIPTION="KDE version of the Simon Says game."
 KEYWORDS=""
@@ -24,5 +18,3 @@ DEPEND="
 RDEPEND="${DEPEND}
 	$(add_kdebase_dep knotify)
 "
-
-KMEXTRACTONLY="libkdeedu/kdeeduui"

diff --git a/kde-base/cantor/cantor-9999.ebuild b/kde-base/cantor/cantor-9999.ebuild
index 7bc58be..18798e4 100644
--- a/kde-base/cantor/cantor-9999.ebuild
+++ b/kde-base/cantor/cantor-9999.ebuild
@@ -6,13 +6,7 @@ EAPI=4
 
 KDE_HANDBOOK="optional"
 KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeedu"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
+inherit kde4-base
 
 DESCRIPTION="KDE4 interface for doing mathematics and scientific computing"
 KEYWORDS=""
@@ -32,11 +26,11 @@ src_configure() {
 		$(cmake-utils_use_with ps LibSpectre)
 		$(cmake-utils_use_with R)
 	"
-	${kde_eclass}_src_configure
+	kde4-base_src_configure
 }
 
 pkg_postinst() {
-	${kde_eclass}_pkg_postinst
+	kde4-base_pkg_postinst
 
 	if ! use R; then
 		echo

diff --git a/kde-base/dolphin/dolphin-9999.ebuild b/kde-base/dolphin/dolphin-9999.ebuild
index bcfaeac..98c57b8 100644
--- a/kde-base/dolphin/dolphin-9999.ebuild
+++ b/kde-base/dolphin/dolphin-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-KMNAME="kdebase-apps"
+KMNAME="kde-baseapps"
 inherit kde4-meta
 
 DESCRIPTION="A KDE filemanager focusing on usability"

diff --git a/kde-base/drkonqi/drkonqi-9999.ebuild b/kde-base/drkonqi/drkonqi-9999.ebuild
index 9c4b22d..5fdae6d 100644
--- a/kde-base/drkonqi/drkonqi-9999.ebuild
+++ b/kde-base/drkonqi/drkonqi-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-runtime"
+KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE crash handler, gives the user feedback if a program crashed"

diff --git a/kde-base/freespacenotifier/freespacenotifier-9999.ebuild b/kde-base/freespacenotifier/freespacenotifier-9999.ebuild
index 1d9b0fe..82bc609 100644
--- a/kde-base/freespacenotifier/freespacenotifier-9999.ebuild
+++ b/kde-base/freespacenotifier/freespacenotifier-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-workspace"
+KMNAME="kde-workspace"
 inherit kde4-meta
 
 DESCRIPTION="A module that monitors free disk space on the home dir"

diff --git a/kde-base/gwenview/gwenview-9999.ebuild b/kde-base/gwenview/gwenview-9999.ebuild
index b56ab6b..7b8d11a 100644
--- a/kde-base/gwenview/gwenview-9999.ebuild
+++ b/kde-base/gwenview/gwenview-9999.ebuild
@@ -5,14 +5,8 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-if [[ ${PV} == *9999 ]]; then
-	KDE_SCM="git"
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdegraphics"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
+KDE_SCM="git"
+inherit kde4-base
 
 DESCRIPTION="KDE image viewer"
 KEYWORDS=""
@@ -44,11 +38,11 @@ src_configure() {
 		mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=None)
 	fi
 
-	${kde_eclass}_src_configure
+	kde4-base_src_configure
 }
 
 pkg_postinst() {
-	${kde_eclass}_pkg_postinst
+	kde4-base_pkg_postinst
 
 	echo
 	elog "For SVG support, emerge -va kde-base/svgpart"

diff --git a/kde-base/kalgebra/kalgebra-4.6.80.ebuild b/kde-base/kalgebra/kalgebra-4.6.80.ebuild
index a4bd41e..5756018 100644
--- a/kde-base/kalgebra/kalgebra-4.6.80.ebuild
+++ b/kde-base/kalgebra/kalgebra-4.6.80.ebuild
@@ -41,10 +41,8 @@ src_configure() {
 
 src_test() {
 	# disable broken test
-	local dir
-	dir="${S}"
 	sed -i -e '/mathmlpresentationtest/ s/^/#DO_NOT_RUN_TEST /' \
-		"${dir}"/analitza/tests/CMakeLists.txt || \
+		"${S}"/analitza/tests/CMakeLists.txt || \
 		die "sed to disable mathmlpresentationtest failed."
 
 	kde4-base_src_test

diff --git a/kde-base/kalgebra/kalgebra-9999.ebuild b/kde-base/kalgebra/kalgebra-9999.ebuild
index 820d760..d86b2e9 100644
--- a/kde-base/kalgebra/kalgebra-9999.ebuild
+++ b/kde-base/kalgebra/kalgebra-9999.ebuild
@@ -7,14 +7,7 @@ EAPI=4
 KDE_HANDBOOK="optional"
 OPENGL_REQUIRED="optional"
 KDE_SCM="git"
-
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeedu"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
+inherit kde4-base
 
 DESCRIPTION="MathML-based graph calculator for KDE."
 KEYWORDS=""
@@ -43,20 +36,14 @@ src_configure() {
 		$(cmake-utils_use_with opengl OpenGL)
 	)
 
-	${kde_eclass}_src_configure
+	kde4-base_src_configure
 }
 
 src_test() {
 	# disable broken test
-	local dir
-	if [[ ${PV} == *9999 ]]; then
-		dir="${S}"
-	else
-		dir="${S}/${PN}"
-	fi
 	sed -i -e '/mathmlpresentationtest/ s/^/#DO_NOT_RUN_TEST /' \
-		"${dir}"/analitza/tests/CMakeLists.txt || \
+		"${S}"/analitza/tests/CMakeLists.txt || \
 		die "sed to disable mathmlpresentationtest failed."
 
-	${kde_eclass}_src_test
+	kde4-base_src_test
 }

diff --git a/kde-base/kalzium/kalzium-4.6.80.ebuild b/kde-base/kalzium/kalzium-4.6.80.ebuild
index 1110da5..f19c96b 100644
--- a/kde-base/kalzium/kalzium-4.6.80.ebuild
+++ b/kde-base/kalzium/kalzium-4.6.80.ebuild
@@ -8,7 +8,7 @@ KDE_HANDBOOK="optional"
 KDE_SCM="git"
 CPPUNIT_REQUIRED="optional"
 OPENGL_REQUIRED="always"
-inherit flag-o-matic kde4-base
+inherit kde4-base flag-o-matic
 
 DESCRIPTION="KDE: periodic table of the elements."
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"

diff --git a/kde-base/kalzium/kalzium-9999.ebuild b/kde-base/kalzium/kalzium-9999.ebuild
index 8f3bdcc..7deedfa 100644
--- a/kde-base/kalzium/kalzium-9999.ebuild
+++ b/kde-base/kalzium/kalzium-9999.ebuild
@@ -6,15 +6,9 @@ EAPI=4
 
 KDE_HANDBOOK="optional"
 KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeedu"
-	kde_eclass="kde4-meta"
-fi
 CPPUNIT_REQUIRED="optional"
 OPENGL_REQUIRED="always"
-inherit ${kde_eclass} flag-o-matic
+inherit kde4-base flag-o-matic
 
 DESCRIPTION="KDE: periodic table of the elements."
 KEYWORDS=""
@@ -46,5 +40,5 @@ src_configure(){
 		$(cmake-utils_use_with solver Libfacile)
 	)
 
-	${kde_eclass}_src_configure
+	kde4-base_src_configure
 }

diff --git a/kde-base/kamera/kamera-4.6.80.ebuild b/kde-base/kamera/kamera-4.6.80.ebuild
index f842604..7aa55e0 100644
--- a/kde-base/kamera/kamera-4.6.80.ebuild
+++ b/kde-base/kamera/kamera-4.6.80.ebuild
@@ -16,15 +16,3 @@ DEPEND="
 	media-libs/libgphoto2
 "
 RDEPEND="${DEPEND}"
-
-if [[ ${PV} != *9999 ]]; then
-src_unpack() {
-	if use handbook; then
-		KMEXTRA="
-			doc/kcontrol/${PN}
-		"
-	fi
-
-	kde4-base_src_unpack
-}
-fi

diff --git a/kde-base/kamera/kamera-9999.ebuild b/kde-base/kamera/kamera-9999.ebuild
index 7468fb6..87acf53 100644
--- a/kde-base/kamera/kamera-9999.ebuild
+++ b/kde-base/kamera/kamera-9999.ebuild
@@ -5,14 +5,8 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-if [[ ${PV} == *9999 ]]; then
-	KDE_SCM="git"
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdegraphics"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
+KDE_SCM="git"
+inherit kde4-base
 
 DESCRIPTION="KDE digital camera manager"
 KEYWORDS=""
@@ -22,15 +16,3 @@ DEPEND="
 	media-libs/libgphoto2
 "
 RDEPEND="${DEPEND}"
-
-if [[ ${PV} != *9999 ]]; then
-src_unpack() {
-	if use handbook; then
-		KMEXTRA="
-			doc/kcontrol/${PN}
-		"
-	fi
-
-	kde4-meta_src_unpack
-}
-fi

diff --git a/kde-base/kanagram/kanagram-4.6.80.ebuild b/kde-base/kanagram/kanagram-4.6.80.ebuild
index 174d089..23f9111 100644
--- a/kde-base/kanagram/kanagram-4.6.80.ebuild
+++ b/kde-base/kanagram/kanagram-4.6.80.ebuild
@@ -15,7 +15,3 @@ IUSE="debug"
 DEPEND="
 	$(add_kdebase_dep libkdeedu)
 "
-KMEXTRACTONLY="
-	libkdeedu/kdeeduui/
-	libkdeedu/keduvocdocument/
-"

diff --git a/kde-base/kanagram/kanagram-9999.ebuild b/kde-base/kanagram/kanagram-9999.ebuild
index 7efe981..524783f 100644
--- a/kde-base/kanagram/kanagram-9999.ebuild
+++ b/kde-base/kanagram/kanagram-9999.ebuild
@@ -6,13 +6,7 @@ EAPI=4
 
 KDE_HANDBOOK="optional"
 KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeedu"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
+inherit kde4-base
 
 DESCRIPTION="KDE: letter order game."
 KEYWORDS=""
@@ -21,7 +15,3 @@ IUSE="debug"
 DEPEND="
 	$(add_kdebase_dep libkdeedu)
 "
-KMEXTRACTONLY="
-	libkdeedu/kdeeduui/
-	libkdeedu/keduvocdocument/
-"

diff --git a/kde-base/kate/kate-9999.ebuild b/kde-base/kate/kate-9999.ebuild
index 5fb984b..2b64588 100644
--- a/kde-base/kate/kate-9999.ebuild
+++ b/kde-base/kate/kate-9999.ebuild
@@ -5,8 +5,7 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-KMNAME="kdesdk"
-[[ ${PV} == *9999 ]] && KMNAME="kate"
+KMNAME="kate"
 KDE_SCM="git"
 inherit kde4-meta
 

diff --git a/kde-base/kbruch/kbruch-9999.ebuild b/kde-base/kbruch/kbruch-9999.ebuild
index 801e506..49fc54a 100644
--- a/kde-base/kbruch/kbruch-9999.ebuild
+++ b/kde-base/kbruch/kbruch-9999.ebuild
@@ -6,13 +6,7 @@ EAPI=4
 
 KDE_HANDBOOK="optional"
 KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeedu"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
+inherit kde4-base
 
 DESCRIPTION="KDE Educational: Learn calculating with fractions"
 KEYWORDS=""

diff --git a/kde-base/kcheckpass/kcheckpass-9999.ebuild b/kde-base/kcheckpass/kcheckpass-9999.ebuild
index cb2304c..a08f789 100644
--- a/kde-base/kcheckpass/kcheckpass-9999.ebuild
+++ b/kde-base/kcheckpass/kcheckpass-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-workspace"
+KMNAME="kde-workspace"
 inherit kde4-meta
 
 DESCRIPTION="A simple password checker, used by any software in need of user authentication."

diff --git a/kde-base/kcminit/kcminit-9999.ebuild b/kde-base/kcminit/kcminit-9999.ebuild
index 05d8cb9..85314ac 100644
--- a/kde-base/kcminit/kcminit-9999.ebuild
+++ b/kde-base/kcminit/kcminit-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-workspace"
+KMNAME="kde-workspace"
 inherit kde4-meta
 
 DESCRIPTION="KCMInit - runs startups initialization for Control Modules."

diff --git a/kde-base/kcmshell/kcmshell-9999.ebuild b/kde-base/kcmshell/kcmshell-9999.ebuild
index 12b0c12..af9d857 100644
--- a/kde-base/kcmshell/kcmshell-9999.ebuild
+++ b/kde-base/kcmshell/kcmshell-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-runtime"
+KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KCMShell is a utility to host KDE control modules independently of SystemSettings."

diff --git a/kde-base/kcolorchooser/kcolorchooser-9999.ebuild b/kde-base/kcolorchooser/kcolorchooser-9999.ebuild
index 6e7c37f..c92a74b 100644
--- a/kde-base/kcolorchooser/kcolorchooser-9999.ebuild
+++ b/kde-base/kcolorchooser/kcolorchooser-9999.ebuild
@@ -5,13 +5,7 @@
 EAPI=4
 
 KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdegraphics"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
+inherit kde4-base
 
 DESCRIPTION="KDE color selector/editor"
 KEYWORDS=""

diff --git a/kde-base/kcontrol/kcontrol-9999.ebuild b/kde-base/kcontrol/kcontrol-9999.ebuild
index eed03c4..e8ae4a5 100644
--- a/kde-base/kcontrol/kcontrol-9999.ebuild
+++ b/kde-base/kcontrol/kcontrol-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-KMNAME="kdebase-runtime"
+KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="The KDE Control Center"

diff --git a/kde-base/kdebase-cursors/kdebase-cursors-4.6.80.ebuild b/kde-base/kdebase-cursors/kdebase-cursors-4.6.80.ebuild
index db5e42d..8199232 100644
--- a/kde-base/kdebase-cursors/kdebase-cursors-4.6.80.ebuild
+++ b/kde-base/kdebase-cursors/kdebase-cursors-4.6.80.ebuild
@@ -5,8 +5,7 @@
 EAPI=4
 
 KMNAME="kde-workspace"
-KMEXTRA="cursors"
-KMNOMODULE="true"
+KMMODULE="cursors"
 inherit kde4-meta
 
 DESCRIPTION="oxygen cursors from kdebase"

diff --git a/kde-base/kdebase-cursors/kdebase-cursors-4.6.9999.ebuild b/kde-base/kdebase-cursors/kdebase-cursors-4.6.9999.ebuild
index 4e4372b..633edc5 100644
--- a/kde-base/kdebase-cursors/kdebase-cursors-4.6.9999.ebuild
+++ b/kde-base/kdebase-cursors/kdebase-cursors-4.6.9999.ebuild
@@ -5,8 +5,7 @@
 EAPI=4
 
 KMNAME="kdebase-workspace"
-KMEXTRA="cursors"
-KMNOMODULE="true"
+KMMODULE="cursors"
 inherit kde4-meta
 
 DESCRIPTION="oxygen cursors from kdebase"

diff --git a/kde-base/kdebase-cursors/kdebase-cursors-9999.ebuild b/kde-base/kdebase-cursors/kdebase-cursors-9999.ebuild
index 4e4372b..9fe4df5 100644
--- a/kde-base/kdebase-cursors/kdebase-cursors-9999.ebuild
+++ b/kde-base/kdebase-cursors/kdebase-cursors-9999.ebuild
@@ -4,9 +4,8 @@
 
 EAPI=4
 
-KMNAME="kdebase-workspace"
-KMEXTRA="cursors"
-KMNOMODULE="true"
+KMNAME="kde-workspace"
+KMMODULE="cursors"
 inherit kde4-meta
 
 DESCRIPTION="oxygen cursors from kdebase"

diff --git a/kde-base/kdebase-data/kdebase-data-9999.ebuild b/kde-base/kdebase-data/kdebase-data-9999.ebuild
index 2d6552d..0155f76 100644
--- a/kde-base/kdebase-data/kdebase-data-9999.ebuild
+++ b/kde-base/kdebase-data/kdebase-data-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-runtime"
+KMNAME="kde-runtime"
 KMNOMODULE="true"
 inherit kde4-meta
 

diff --git a/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-9999.ebuild b/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-9999.ebuild
index b26ace1..a2195d6 100644
--- a/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-9999.ebuild
+++ b/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-runtime"
+KMNAME="kde-runtime"
 KMMODULE="desktoptheme"
 inherit kde4-meta
 

diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-9999.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-9999.ebuild
index c5d9fdb..10870bc 100644
--- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-9999.ebuild
+++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-KMNAME="kdebase-runtime"
+KMNAME="kde-runtime"
 KMMODULE="kioslave"
 inherit kde4-meta
 

diff --git a/kde-base/kdebase-menu-icons/kdebase-menu-icons-9999.ebuild b/kde-base/kdebase-menu-icons/kdebase-menu-icons-9999.ebuild
index 94479ad..8c35ec2 100644
--- a/kde-base/kdebase-menu-icons/kdebase-menu-icons-9999.ebuild
+++ b/kde-base/kdebase-menu-icons/kdebase-menu-icons-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-runtime"
+KMNAME="kde-runtime"
 KMMODULE="menu"
 inherit kde4-meta
 

diff --git a/kde-base/kdebase-menu/kdebase-menu-9999.ebuild b/kde-base/kdebase-menu/kdebase-menu-9999.ebuild
index 446d5c4..03a9ccd 100644
--- a/kde-base/kdebase-menu/kdebase-menu-9999.ebuild
+++ b/kde-base/kdebase-menu/kdebase-menu-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-runtime"
+KMNAME="kde-runtime"
 KMMODULE="kde-menu"
 inherit kde4-meta
 

diff --git a/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild
index 01b772d..365d11d 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-workspace"
+KMNAME="kde-workspace"
 KMNOMODULE="true"
 inherit kde4-meta multilib prefix
 

diff --git a/kde-base/kdebugdialog/kdebugdialog-9999.ebuild b/kde-base/kdebugdialog/kdebugdialog-9999.ebuild
index 4d421cf..3e4fac3 100644
--- a/kde-base/kdebugdialog/kdebugdialog-9999.ebuild
+++ b/kde-base/kdebugdialog/kdebugdialog-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-KMNAME="kdebase-runtime"
+KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE: A dialog box for setting preferences for debug output"

diff --git a/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-4.6.80.ebuild b/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-4.6.80.ebuild
index ab11afb..153c810 100644
--- a/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-4.6.80.ebuild
+++ b/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-4.6.80.ebuild
@@ -11,12 +11,6 @@ DESCRIPTION="kdegraphics: strigi plugins"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
-if [[ ${PV} != *9999 ]]; then
-KMEXTRACTONLY="
-	libs/mobipocket/
-"
-fi
-
 DEPEND="
 	app-misc/strigi
 "

diff --git a/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-9999.ebuild b/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-9999.ebuild
index cb79891..8fea82e 100644
--- a/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-9999.ebuild
+++ b/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-9999.ebuild
@@ -5,25 +5,12 @@
 EAPI=4
 
 KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdegraphics"
-	KMMODULE="strigi-analyzer"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
+inherit kde4-base
 
 DESCRIPTION="kdegraphics: strigi plugins"
 KEYWORDS=""
 IUSE="debug"
 
-if [[ ${PV} != *9999 ]]; then
-KMEXTRACTONLY="
-	libs/mobipocket/
-"
-fi
-
 DEPEND="
 	app-misc/strigi
 "

diff --git a/kde-base/kdepasswd/kdepasswd-9999.ebuild b/kde-base/kdepasswd/kdepasswd-9999.ebuild
index 58c4548..2c7bdff 100644
--- a/kde-base/kdepasswd/kdepasswd-9999.ebuild
+++ b/kde-base/kdepasswd/kdepasswd-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-KMNAME="kdebase-apps"
+KMNAME="kde-baseapps"
 inherit kde4-meta
 
 DESCRIPTION="KDE GUI for passwd"

diff --git a/kde-base/kdesu/kdesu-9999.ebuild b/kde-base/kdesu/kdesu-9999.ebuild
index 043c5ea..a625203 100644
--- a/kde-base/kdesu/kdesu-9999.ebuild
+++ b/kde-base/kdesu/kdesu-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-KMNAME="kdebase-runtime"
+KMNAME="kde-runtime"
 inherit kde4-meta
 
 # FIXME: Is default command ( su/sudo ) still configurable,

diff --git a/kde-base/kdialog/kdialog-9999.ebuild b/kde-base/kdialog/kdialog-9999.ebuild
index 5484ac0..d40c1ab 100644
--- a/kde-base/kdialog/kdialog-9999.ebuild
+++ b/kde-base/kdialog/kdialog-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-apps"
+KMNAME="kde-baseapps"
 inherit kde4-meta
 
 DESCRIPTION="KDialog can be used to show nice dialog boxes from shell scripts"

diff --git a/kde-base/kdm/kdm-9999.ebuild b/kde-base/kdm/kdm-9999.ebuild
index 0a99097..bad9996 100644
--- a/kde-base/kdm/kdm-9999.ebuild
+++ b/kde-base/kdm/kdm-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-KMNAME="kdebase-workspace"
+KMNAME="kde-workspace"
 inherit kde4-meta flag-o-matic
 
 DESCRIPTION="KDE login manager, similar to xdm and gdm"

diff --git a/kde-base/kdontchangethehostname/kdontchangethehostname-9999.ebuild b/kde-base/kdontchangethehostname/kdontchangethehostname-9999.ebuild
index 3f96b18..25e6486 100644
--- a/kde-base/kdontchangethehostname/kdontchangethehostname-9999.ebuild
+++ b/kde-base/kdontchangethehostname/kdontchangethehostname-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-runtime"
+KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="Tool to inform KDE about a change in hostname"

diff --git a/kde-base/keditbookmarks/keditbookmarks-9999.ebuild b/kde-base/keditbookmarks/keditbookmarks-9999.ebuild
index da86b93..ad4d01f 100644
--- a/kde-base/keditbookmarks/keditbookmarks-9999.ebuild
+++ b/kde-base/keditbookmarks/keditbookmarks-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-apps"
+KMNAME="kde-baseapps"
 inherit kde4-meta
 
 DESCRIPTION="KDE's bookmarks editor"

diff --git a/kde-base/keditfiletype/keditfiletype-9999.ebuild b/kde-base/keditfiletype/keditfiletype-9999.ebuild
index d53a73c..c069a0d 100644
--- a/kde-base/keditfiletype/keditfiletype-9999.ebuild
+++ b/kde-base/keditfiletype/keditfiletype-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-runtime"
+KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE mime/file type assocciation editor"

diff --git a/kde-base/kephal/kephal-9999.ebuild b/kde-base/kephal/kephal-9999.ebuild
index e5717cb..7de514d 100644
--- a/kde-base/kephal/kephal-9999.ebuild
+++ b/kde-base/kephal/kephal-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-workspace"
+KMNAME="kde-workspace"
 KMMODULE="libs/kephal"
 inherit kde4-meta
 

diff --git a/kde-base/kfile/kfile-9999.ebuild b/kde-base/kfile/kfile-9999.ebuild
index c9eb714..1265369 100644
--- a/kde-base/kfile/kfile-9999.ebuild
+++ b/kde-base/kfile/kfile-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-runtime"
+KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="A commandline frontend to KFileMetaInfo"

diff --git a/kde-base/kfind/kfind-9999.ebuild b/kde-base/kfind/kfind-9999.ebuild
index c455ff1..b8a114f 100644
--- a/kde-base/kfind/kfind-9999.ebuild
+++ b/kde-base/kfind/kfind-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-KMNAME="kdebase-apps"
+KMNAME="kde-baseapps"
 inherit kde4-meta
 
 DESCRIPTION="KDE file finder utility"

diff --git a/kde-base/kfmclient/kfmclient-9999.ebuild b/kde-base/kfmclient/kfmclient-9999.ebuild
index 8b2ca44..30f6735 100644
--- a/kde-base/kfmclient/kfmclient-9999.ebuild
+++ b/kde-base/kfmclient/kfmclient-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-apps"
+KMNAME="kde-baseapps"
 KMMODULE="konqueror/client"
 inherit kde4-meta
 

diff --git a/kde-base/kgamma/kgamma-4.6.80.ebuild b/kde-base/kgamma/kgamma-4.6.80.ebuild
index 781992e..8faa8f1 100644
--- a/kde-base/kgamma/kgamma-4.6.80.ebuild
+++ b/kde-base/kgamma/kgamma-4.6.80.ebuild
@@ -19,11 +19,3 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	x11-proto/xf86vidmodeproto
 "
-
-src_unpack() {
-	if use handbook; then
-		KMEXTRA_NOFATAL+=" doc/kcontrol/kgamma"
-	fi
-
-	kde4-base_src_unpack
-}

diff --git a/kde-base/kgamma/kgamma-9999.ebuild b/kde-base/kgamma/kgamma-9999.ebuild
index 78597d0..8a175a8 100644
--- a/kde-base/kgamma/kgamma-9999.ebuild
+++ b/kde-base/kgamma/kgamma-9999.ebuild
@@ -6,14 +6,8 @@ EAPI=4
 
 KDE_HANDBOOK="optional"
 KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdegraphics"
-	kde_eclass="kde4-meta"
-fi
 
-inherit ${kde_eclass}
+inherit kde4-base
 
 DESCRIPTION="KDE screen gamma values kcontrol module"
 KEYWORDS=""
@@ -25,11 +19,3 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	x11-proto/xf86vidmodeproto
 "
-
-src_unpack() {
-	if use handbook; then
-		KMEXTRA_NOFATAL+=" doc/kcontrol/kgamma"
-	fi
-
-	${kde_eclass}_src_unpack
-}

diff --git a/kde-base/kgeography/kgeography-9999.ebuild b/kde-base/kgeography/kgeography-9999.ebuild
index af576dc..c70297c 100644
--- a/kde-base/kgeography/kgeography-9999.ebuild
+++ b/kde-base/kgeography/kgeography-9999.ebuild
@@ -6,13 +6,7 @@ EAPI=4
 
 KDE_HANDBOOK="optional"
 KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeedu"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
+inherit kde4-base
 
 DESCRIPTION="KDE: a geography learning tool"
 KEYWORDS=""

diff --git a/kde-base/kglobalaccel/kglobalaccel-9999.ebuild b/kde-base/kglobalaccel/kglobalaccel-9999.ebuild
index 532d36f..a9c76ed 100644
--- a/kde-base/kglobalaccel/kglobalaccel-9999.ebuild
+++ b/kde-base/kglobalaccel/kglobalaccel-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-runtime"
+KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE's Global Shortcut Daemon"

diff --git a/kde-base/khangman/khangman-4.6.80.ebuild b/kde-base/khangman/khangman-4.6.80.ebuild
index 1fd666c..55a8c11 100644
--- a/kde-base/khangman/khangman-4.6.80.ebuild
+++ b/kde-base/khangman/khangman-4.6.80.ebuild
@@ -15,7 +15,3 @@ IUSE="debug"
 DEPEND="
 	$(add_kdebase_dep libkdeedu)
 "
-
-KMEXTRACTONLY="
-	libkdeedu/keduvocdocument
-"

diff --git a/kde-base/khangman/khangman-9999.ebuild b/kde-base/khangman/khangman-9999.ebuild
index 6b24cfe..f56dbea 100644
--- a/kde-base/khangman/khangman-9999.ebuild
+++ b/kde-base/khangman/khangman-9999.ebuild
@@ -6,13 +6,7 @@ EAPI=4
 
 KDE_HANDBOOK="optional"
 KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeedu"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
+inherit kde4-base
 
 DESCRIPTION="Classical hangman game for KDE"
 KEYWORDS=""
@@ -21,7 +15,3 @@ IUSE="debug"
 DEPEND="
 	$(add_kdebase_dep libkdeedu)
 "
-
-KMEXTRACTONLY="
-	libkdeedu/keduvocdocument
-"

diff --git a/kde-base/khelpcenter/khelpcenter-9999.ebuild b/kde-base/khelpcenter/khelpcenter-9999.ebuild
index 74995c8..283731a 100644
--- a/kde-base/khelpcenter/khelpcenter-9999.ebuild
+++ b/kde-base/khelpcenter/khelpcenter-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI=4
 
 KDE_HANDBOOK="always"
-KMNAME="kdebase-runtime"
+KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="The KDE Help Center"

diff --git a/kde-base/khotkeys/khotkeys-9999.ebuild b/kde-base/khotkeys/khotkeys-9999.ebuild
index bada8d8..d030846 100644
--- a/kde-base/khotkeys/khotkeys-9999.ebuild
+++ b/kde-base/khotkeys/khotkeys-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-workspace"
+KMNAME="kde-workspace"
 inherit kde4-meta
 
 DESCRIPTION="KDE: hotkey daemon"

diff --git a/kde-base/kiconfinder/kiconfinder-9999.ebuild b/kde-base/kiconfinder/kiconfinder-9999.ebuild
index b4c8d80..4e53267 100644
--- a/kde-base/kiconfinder/kiconfinder-9999.ebuild
+++ b/kde-base/kiconfinder/kiconfinder-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-runtime"
+KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="Finds an icon based on its name"

diff --git a/kde-base/kig/kig-9999.ebuild b/kde-base/kig/kig-9999.ebuild
index e911ff3..1d17eae 100644
--- a/kde-base/kig/kig-9999.ebuild
+++ b/kde-base/kig/kig-9999.ebuild
@@ -6,13 +6,7 @@ EAPI=4
 
 KDE_HANDBOOK="optional"
 KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeedu"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
+inherit kde4-base
 
 DESCRIPTION="KDE Interactive Geometry tool"
 KEYWORDS=""
@@ -28,5 +22,5 @@ src_configure() {
 		$(cmake-utils_use_with kig-scripting BoostPython)
 	)
 
-	${kde_eclass}_src_configure
+	kde4-base_src_configure
 }

diff --git a/kde-base/kinfocenter/kinfocenter-9999.ebuild b/kde-base/kinfocenter/kinfocenter-9999.ebuild
index 331141e..39b1fb6 100644
--- a/kde-base/kinfocenter/kinfocenter-9999.ebuild
+++ b/kde-base/kinfocenter/kinfocenter-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-KMNAME="kdebase-workspace"
+KMNAME="kde-workspace"
 OPENGL_REQUIRED="optional"
 inherit kde4-meta
 

diff --git a/kde-base/kioclient/kioclient-9999.ebuild b/kde-base/kioclient/kioclient-9999.ebuild
index 9793723..7cc4ac0 100644
--- a/kde-base/kioclient/kioclient-9999.ebuild
+++ b/kde-base/kioclient/kioclient-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-runtime"
+KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="Command-line tool for network-transparent operations"

diff --git a/kde-base/kiten/kiten-9999.ebuild b/kde-base/kiten/kiten-9999.ebuild
index 399ba45..486560d 100644
--- a/kde-base/kiten/kiten-9999.ebuild
+++ b/kde-base/kiten/kiten-9999.ebuild
@@ -6,13 +6,7 @@ EAPI=4
 
 KDE_HANDBOOK="optional"
 KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeedu"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
+inherit kde4-base
 
 DESCRIPTION="KDE Japanese dictionary and reference"
 KEYWORDS=""

diff --git a/kde-base/klettres/klettres-9999.ebuild b/kde-base/klettres/klettres-9999.ebuild
index 88f3b04..32fcd6f 100644
--- a/kde-base/klettres/klettres-9999.ebuild
+++ b/kde-base/klettres/klettres-9999.ebuild
@@ -6,13 +6,7 @@ EAPI=4
 
 KDE_HANDBOOK="optional"
 KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeedu"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
+inherit kde4-base
 
 DESCRIPTION="KDE: KLettres helps a very young child or an adult learning "
 KEYWORDS=""

diff --git a/kde-base/klipper/klipper-9999.ebuild b/kde-base/klipper/klipper-9999.ebuild
index 94e1ec6..b145d6c 100644
--- a/kde-base/klipper/klipper-9999.ebuild
+++ b/kde-base/klipper/klipper-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-KMNAME="kdebase-workspace"
+KMNAME="kde-workspace"
 inherit kde4-meta
 
 DESCRIPTION="Applet for KDE and X clipboard management"

diff --git a/kde-base/kmenuedit/kmenuedit-9999.ebuild b/kde-base/kmenuedit/kmenuedit-9999.ebuild
index 847db3e..e4de0c9 100644
--- a/kde-base/kmenuedit/kmenuedit-9999.ebuild
+++ b/kde-base/kmenuedit/kmenuedit-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-KMNAME="kdebase-workspace"
+KMNAME="kde-workspace"
 inherit kde4-meta
 
 DESCRIPTION="KDE menu editor"

diff --git a/kde-base/kmimetypefinder/kmimetypefinder-9999.ebuild b/kde-base/kmimetypefinder/kmimetypefinder-9999.ebuild
index bf40ef5..df145ac 100644
--- a/kde-base/kmimetypefinder/kmimetypefinder-9999.ebuild
+++ b/kde-base/kmimetypefinder/kmimetypefinder-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-runtime"
+KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE application to report the mimetype for a given file"

diff --git a/kde-base/kmplot/kmplot-9999.ebuild b/kde-base/kmplot/kmplot-9999.ebuild
index e561a5a..4c5809d 100644
--- a/kde-base/kmplot/kmplot-9999.ebuild
+++ b/kde-base/kmplot/kmplot-9999.ebuild
@@ -6,13 +6,7 @@ EAPI=4
 
 KDE_HANDBOOK="optional"
 KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeedu"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
+inherit kde4-base
 
 DESCRIPTION="Mathematical function plotter for KDE"
 KEYWORDS=""

diff --git a/kde-base/knetattach/knetattach-9999.ebuild b/kde-base/knetattach/knetattach-9999.ebuild
index 37cb0aa..a630575 100644
--- a/kde-base/knetattach/knetattach-9999.ebuild
+++ b/kde-base/knetattach/knetattach-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-KMNAME="kdebase-runtime"
+KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE network wizard"

diff --git a/kde-base/knewstuff/knewstuff-9999.ebuild b/kde-base/knewstuff/knewstuff-9999.ebuild
index ca94103..e7feea9 100644
--- a/kde-base/knewstuff/knewstuff-9999.ebuild
+++ b/kde-base/knewstuff/knewstuff-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-runtime"
+KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE4 software to download and upload 'new stuff'"

diff --git a/kde-base/knotify/knotify-9999.ebuild b/kde-base/knotify/knotify-9999.ebuild
index c83e289..f847aa1 100644
--- a/kde-base/knotify/knotify-9999.ebuild
+++ b/kde-base/knotify/knotify-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-runtime"
+KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="The KDE notification daemon."

diff --git a/kde-base/kolourpaint/kolourpaint-9999.ebuild b/kde-base/kolourpaint/kolourpaint-9999.ebuild
index bff1e5c..9deda83 100644
--- a/kde-base/kolourpaint/kolourpaint-9999.ebuild
+++ b/kde-base/kolourpaint/kolourpaint-9999.ebuild
@@ -6,13 +6,7 @@ EAPI=4
 
 KDE_HANDBOOK="optional"
 KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdegraphics"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
+inherit kde4-base
 
 DESCRIPTION="Paint Program for KDE"
 KEYWORDS=""

diff --git a/kde-base/konq-plugins/konq-plugins-9999.ebuild b/kde-base/konq-plugins/konq-plugins-9999.ebuild
index c9472a7..29416b2 100644
--- a/kde-base/konq-plugins/konq-plugins-9999.ebuild
+++ b/kde-base/konq-plugins/konq-plugins-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-apps"
+KMNAME="kde-baseapps"
 inherit kde4-meta
 
 DESCRIPTION="Various plugins for konqueror"

diff --git a/kde-base/konqueror/konqueror-9999.ebuild b/kde-base/konqueror/konqueror-9999.ebuild
index b298004..5ccbf42 100644
--- a/kde-base/konqueror/konqueror-9999.ebuild
+++ b/kde-base/konqueror/konqueror-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-KMNAME="kdebase-apps"
+KMNAME="kde-baseapps"
 inherit flag-o-matic kde4-meta
 
 DESCRIPTION="KDE: Web browser, file manager, ..."

diff --git a/kde-base/konsole/konsole-9999.ebuild b/kde-base/konsole/konsole-9999.ebuild
index f32fd93..c23bdb7 100644
--- a/kde-base/konsole/konsole-9999.ebuild
+++ b/kde-base/konsole/konsole-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999 ]]; then
 	KDE_DOC_DIRS="doc/manual"
 	kde_eclass="kde4-base"
 else
-	KMNAME="kdebase-apps"
+	KMNAME="kde-baseapps"
 	kde_eclass="kde4-meta"
 fi
 inherit ${kde_eclass}

diff --git a/kde-base/kpasswdserver/kpasswdserver-9999.ebuild b/kde-base/kpasswdserver/kpasswdserver-9999.ebuild
index 459bda7..63f3811 100644
--- a/kde-base/kpasswdserver/kpasswdserver-9999.ebuild
+++ b/kde-base/kpasswdserver/kpasswdserver-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-runtime"
+KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDED Password Module"

diff --git a/kde-base/kquitapp/kquitapp-9999.ebuild b/kde-base/kquitapp/kquitapp-9999.ebuild
index f7f1b56..215439f 100644
--- a/kde-base/kquitapp/kquitapp-9999.ebuild
+++ b/kde-base/kquitapp/kquitapp-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-runtime"
+KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="A CLI application quitter"

diff --git a/kde-base/kreadconfig/kreadconfig-9999.ebuild b/kde-base/kreadconfig/kreadconfig-9999.ebuild
index f1cad6a..b43b429 100644
--- a/kde-base/kreadconfig/kreadconfig-9999.ebuild
+++ b/kde-base/kreadconfig/kreadconfig-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-runtime"
+KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE: A command-line tool to read KConfig entries"

diff --git a/kde-base/kruler/kruler-9999.ebuild b/kde-base/kruler/kruler-9999.ebuild
index d13f9f4..d9b9b9b 100644
--- a/kde-base/kruler/kruler-9999.ebuild
+++ b/kde-base/kruler/kruler-9999.ebuild
@@ -6,13 +6,7 @@ EAPI=4
 
 KDE_HANDBOOK="optional"
 KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdegraphics"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
+inherit kde4-base
 
 DESCRIPTION="A screen ruler for KDE"
 KEYWORDS=""

diff --git a/kde-base/krunner/krunner-9999.ebuild b/kde-base/krunner/krunner-9999.ebuild
index 18e6013..e81fe6d 100644
--- a/kde-base/krunner/krunner-9999.ebuild
+++ b/kde-base/krunner/krunner-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-workspace"
+KMNAME="kde-workspace"
 OPENGL_REQUIRED="optional"
 inherit kde4-meta
 

diff --git a/kde-base/kscreensaver/kscreensaver-9999.ebuild b/kde-base/kscreensaver/kscreensaver-9999.ebuild
index e4557cd..7fceaa0 100644
--- a/kde-base/kscreensaver/kscreensaver-9999.ebuild
+++ b/kde-base/kscreensaver/kscreensaver-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-workspace"
+KMNAME="kde-workspace"
 OPENGL_REQUIRED="optional"
 inherit kde4-meta
 

diff --git a/kde-base/ksmserver/ksmserver-9999.ebuild b/kde-base/ksmserver/ksmserver-9999.ebuild
index 43da2ee..39536e5 100644
--- a/kde-base/ksmserver/ksmserver-9999.ebuild
+++ b/kde-base/ksmserver/ksmserver-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-workspace"
+KMNAME="kde-workspace"
 inherit kde4-meta
 
 DESCRIPTION="The reliable KDE session manager that talks the standard X11R6"

diff --git a/kde-base/ksnapshot/ksnapshot-9999.ebuild b/kde-base/ksnapshot/ksnapshot-9999.ebuild
index 4fd19ec..b645034 100644
--- a/kde-base/ksnapshot/ksnapshot-9999.ebuild
+++ b/kde-base/ksnapshot/ksnapshot-9999.ebuild
@@ -6,13 +6,7 @@ EAPI=4
 
 KDE_HANDBOOK="optional"
 KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdegraphics"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
+inherit kde4-base
 
 DESCRIPTION="KDE Screenshot Utility"
 KEYWORDS=""
@@ -30,5 +24,5 @@ src_configure() {
 		$(cmake-utils_use_with kipi)
 	)
 
-	${kde_eclass}_src_configure
+	kde4-base_src_configure
 }

diff --git a/kde-base/ksplash/ksplash-9999.ebuild b/kde-base/ksplash/ksplash-9999.ebuild
index ac5e3b0..8daeafc 100644
--- a/kde-base/ksplash/ksplash-9999.ebuild
+++ b/kde-base/ksplash/ksplash-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-workspace"
+KMNAME="kde-workspace"
 inherit kde4-meta
 
 DESCRIPTION="KDE splashscreen framework (the splashscreen of KDE itself, not of individual apps)"

diff --git a/kde-base/kstart/kstart-9999.ebuild b/kde-base/kstart/kstart-9999.ebuild
index c23450e..56f4a58 100644
--- a/kde-base/kstart/kstart-9999.ebuild
+++ b/kde-base/kstart/kstart-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-runtime"
+KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE: Utility to launch applications with special window properties"

diff --git a/kde-base/kstartupconfig/kstartupconfig-9999.ebuild b/kde-base/kstartupconfig/kstartupconfig-9999.ebuild
index 0ebc05e..af8d4bc 100644
--- a/kde-base/kstartupconfig/kstartupconfig-9999.ebuild
+++ b/kde-base/kstartupconfig/kstartupconfig-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-workspace"
+KMNAME="kde-workspace"
 inherit kde4-meta
 
 DESCRIPTION="KDE: Utility to launch applications with special window properties"

diff --git a/kde-base/kstyles/kstyles-9999.ebuild b/kde-base/kstyles/kstyles-9999.ebuild
index b3c0977..c8b3d31 100644
--- a/kde-base/kstyles/kstyles-9999.ebuild
+++ b/kde-base/kstyles/kstyles-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-workspace"
+KMNAME="kde-workspace"
 inherit kde4-meta
 
 DESCRIPTION="KDE: A set of different KDE styles."

diff --git a/kde-base/ksysguard/ksysguard-9999.ebuild b/kde-base/ksysguard/ksysguard-9999.ebuild
index b033891..c5041b2 100644
--- a/kde-base/ksysguard/ksysguard-9999.ebuild
+++ b/kde-base/ksysguard/ksysguard-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-KMNAME="kdebase-workspace"
+KMNAME="kde-workspace"
 CPPUNIT_REQUIRED="optional"
 VIRTUALX_REQUIRED=test
 inherit kde4-meta

diff --git a/kde-base/ksystraycmd/ksystraycmd-9999.ebuild b/kde-base/ksystraycmd/ksystraycmd-9999.ebuild
index b4b0360..0cd83d7 100644
--- a/kde-base/ksystraycmd/ksystraycmd-9999.ebuild
+++ b/kde-base/ksystraycmd/ksystraycmd-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-workspace"
+KMNAME="kde-workspace"
 inherit kde4-meta
 
 DESCRIPTION="Ksystraycmd embeds applications given as argument into the system tray."

diff --git a/kde-base/ktimezoned/ktimezoned-9999.ebuild b/kde-base/ktimezoned/ktimezoned-9999.ebuild
index e39c575..eca67dd 100644
--- a/kde-base/ktimezoned/ktimezoned-9999.ebuild
+++ b/kde-base/ktimezoned/ktimezoned-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-runtime"
+KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE: Timezone daemon"

diff --git a/kde-base/ktouch/ktouch-9999.ebuild b/kde-base/ktouch/ktouch-9999.ebuild
index f2f6ea3..360680f 100644
--- a/kde-base/ktouch/ktouch-9999.ebuild
+++ b/kde-base/ktouch/ktouch-9999.ebuild
@@ -6,13 +6,7 @@ EAPI=4
 
 KDE_HANDBOOK="optional"
 KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeedu"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
+inherit kde4-base
 
 DESCRIPTION="KDE: A program that helps you to learn and practice touch typing"
 KEYWORDS=""

diff --git a/kde-base/ktraderclient/ktraderclient-9999.ebuild b/kde-base/ktraderclient/ktraderclient-9999.ebuild
index 00331bb..6805466 100644
--- a/kde-base/ktraderclient/ktraderclient-9999.ebuild
+++ b/kde-base/ktraderclient/ktraderclient-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-runtime"
+KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="A command-line tool for querying the KDE trader system"

diff --git a/kde-base/kturtle/kturtle-9999.ebuild b/kde-base/kturtle/kturtle-9999.ebuild
index ab426ac..cbffd76 100644
--- a/kde-base/kturtle/kturtle-9999.ebuild
+++ b/kde-base/kturtle/kturtle-9999.ebuild
@@ -6,13 +6,7 @@ EAPI=4
 
 KDE_HANDBOOK="optional"
 KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeedu"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
+inherit kde4-base
 
 DESCRIPTION="KDE: Educational programming environment using the Logo programming language"
 KEYWORDS=""

diff --git a/kde-base/kuiserver/kuiserver-9999.ebuild b/kde-base/kuiserver/kuiserver-9999.ebuild
index a190a1a..66df101 100644
--- a/kde-base/kuiserver/kuiserver-9999.ebuild
+++ b/kde-base/kuiserver/kuiserver-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-runtime"
+KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE: Progress Info UI server"

diff --git a/kde-base/kurifilter-plugins/kurifilter-plugins-9999.ebuild b/kde-base/kurifilter-plugins/kurifilter-plugins-9999.ebuild
index 0c5a0d6..3815066 100644
--- a/kde-base/kurifilter-plugins/kurifilter-plugins-9999.ebuild
+++ b/kde-base/kurifilter-plugins/kurifilter-plugins-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-runtime"
+KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE: Plugins to manage filtering URIs."

diff --git a/kde-base/kwalletd/kwalletd-9999.ebuild b/kde-base/kwalletd/kwalletd-9999.ebuild
index 1da1d7b..d6bd1cc 100644
--- a/kde-base/kwalletd/kwalletd-9999.ebuild
+++ b/kde-base/kwalletd/kwalletd-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-runtime"
+KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE Password Server"

diff --git a/kde-base/kwin/kwin-9999.ebuild b/kde-base/kwin/kwin-9999.ebuild
index 333b1f2..4be74b0 100644
--- a/kde-base/kwin/kwin-9999.ebuild
+++ b/kde-base/kwin/kwin-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-workspace"
+KMNAME="kde-workspace"
 OPENGL_REQUIRED="optional"
 inherit kde4-meta
 

diff --git a/kde-base/kwordquiz/kwordquiz-4.6.80.ebuild b/kde-base/kwordquiz/kwordquiz-4.6.80.ebuild
index ae4278a..8866986 100644
--- a/kde-base/kwordquiz/kwordquiz-4.6.80.ebuild
+++ b/kde-base/kwordquiz/kwordquiz-4.6.80.ebuild
@@ -15,6 +15,3 @@ IUSE="debug"
 DEPEND="
 	$(add_kdebase_dep libkdeedu)
 "
-KMEXTRACTONLY="
-	libkdeedu/keduvocdocument
-"

diff --git a/kde-base/kwordquiz/kwordquiz-9999.ebuild b/kde-base/kwordquiz/kwordquiz-9999.ebuild
index b04ccc3..64ce513 100644
--- a/kde-base/kwordquiz/kwordquiz-9999.ebuild
+++ b/kde-base/kwordquiz/kwordquiz-9999.ebuild
@@ -6,13 +6,7 @@ EAPI=4
 
 KDE_HANDBOOK="optional"
 KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeedu"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
+inherit kde4-base
 
 DESCRIPTION="KDE: A powerful flashcard and vocabulary learning program"
 KEYWORDS=""
@@ -21,6 +15,3 @@ IUSE="debug"
 DEPEND="
 	$(add_kdebase_dep libkdeedu)
 "
-KMEXTRACTONLY="
-	libkdeedu/keduvocdocument
-"

diff --git a/kde-base/kwrite/kwrite-9999.ebuild b/kde-base/kwrite/kwrite-9999.ebuild
index 700ef35..dff0fe4 100644
--- a/kde-base/kwrite/kwrite-9999.ebuild
+++ b/kde-base/kwrite/kwrite-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-KMNAME="kdebase-apps"
+KMNAME="kde-baseapps"
 [[ ${PV} = *9999 ]] && KMNAME="kate"
 KDE_SCM="git"
 inherit kde4-meta

diff --git a/kde-base/kwrited/kwrited-9999.ebuild b/kde-base/kwrited/kwrited-9999.ebuild
index 234b961..0febf52 100644
--- a/kde-base/kwrited/kwrited-9999.ebuild
+++ b/kde-base/kwrited/kwrited-9999.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=4
-KMNAME="kdebase-workspace"
+KMNAME="kde-workspace"
 inherit kde4-meta
 
 DESCRIPTION="KDE daemon listening for wall and write messages."

diff --git a/kde-base/libkdcraw/libkdcraw-9999.ebuild b/kde-base/libkdcraw/libkdcraw-9999.ebuild
index 578cda4..f37d820 100644
--- a/kde-base/libkdcraw/libkdcraw-9999.ebuild
+++ b/kde-base/libkdcraw/libkdcraw-9999.ebuild
@@ -5,14 +5,7 @@
 EAPI=4
 
 KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdegraphics"
-	KMMODULE="libs/${PN}"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
+inherit kde4-base
 
 DESCRIPTION="KDE digital camera raw image library wrapper"
 HOMEPAGE="http://www.kipi-plugins.org"

diff --git a/kde-base/libkdeedu/libkdeedu-4.6.80.ebuild b/kde-base/libkdeedu/libkdeedu-4.6.80.ebuild
index 79ca210..474862c 100644
--- a/kde-base/libkdeedu/libkdeedu-4.6.80.ebuild
+++ b/kde-base/libkdeedu/libkdeedu-4.6.80.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=4
 
+KDE_SCM="git"
 inherit kde4-base
 
 DESCRIPTION="Common library for KDE educational apps"

diff --git a/kde-base/libkdeedu/libkdeedu-9999.ebuild b/kde-base/libkdeedu/libkdeedu-9999.ebuild
index b04e6ee..928dfd9 100644
--- a/kde-base/libkdeedu/libkdeedu-9999.ebuild
+++ b/kde-base/libkdeedu/libkdeedu-9999.ebuild
@@ -5,19 +5,13 @@
 EAPI=4
 
 KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeedu"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
+inherit kde4-base
 
 DESCRIPTION="Common library for KDE educational apps"
 KEYWORDS=""
 IUSE="debug"
 
-# 4 of 4 tests fail. Last checked for 4.6.1. Tests are fundamentally broken, 
+# 4 of 4 tests fail. Last checked for 4.6.1. Tests are fundamentally broken,
 # see bug 258857 for details.
 RESTRICT=test
 

diff --git a/kde-base/libkexiv2/libkexiv2-9999.ebuild b/kde-base/libkexiv2/libkexiv2-9999.ebuild
index a56f061..d9a3bd3 100644
--- a/kde-base/libkexiv2/libkexiv2-9999.ebuild
+++ b/kde-base/libkexiv2/libkexiv2-9999.ebuild
@@ -5,14 +5,7 @@
 EAPI=4
 
 KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdegraphics"
-	KMMODULE="libs/libkexiv2"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
+inherit kde4-base
 
 DESCRIPTION="KDE Image Plugin Interface: an exiv2 library wrapper"
 HOMEPAGE="http://www.kipi-plugins.org"

diff --git a/kde-base/libkipi/libkipi-9999.ebuild b/kde-base/libkipi/libkipi-9999.ebuild
index 73ecadc..0a6682c 100644
--- a/kde-base/libkipi/libkipi-9999.ebuild
+++ b/kde-base/libkipi/libkipi-9999.ebuild
@@ -5,14 +5,7 @@
 EAPI=4
 
 KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdegraphics"
-	KMMODULE="libs/${PN}"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
+inherit kde4-base
 
 DESCRIPTION="A library for image plugins accross KDE applications."
 HOMEPAGE="http://www.kipi-plugins.org"

diff --git a/kde-base/libkonq/libkonq-9999.ebuild b/kde-base/libkonq/libkonq-9999.ebuild
index f5c5d33..7924e71 100644
--- a/kde-base/libkonq/libkonq-9999.ebuild
+++ b/kde-base/libkonq/libkonq-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-apps"
+KMNAME="kde-baseapps"
 KMMODULE="lib/konq"
 CPPUNIT_REQUIRED="optional"
 inherit kde4-meta

diff --git a/kde-base/libksane/libksane-9999.ebuild b/kde-base/libksane/libksane-9999.ebuild
index d74ab33..fce0790 100644
--- a/kde-base/libksane/libksane-9999.ebuild
+++ b/kde-base/libksane/libksane-9999.ebuild
@@ -5,14 +5,7 @@
 EAPI=4
 
 KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdegraphics"
-	KMMODULE="libs/${PN}"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
+inherit kde4-base
 
 DESCRIPTION="SANE Library interface for KDE"
 HOMEPAGE="http://www.kipi-plugins.org"
@@ -24,13 +17,3 @@ DEPEND="
 	media-gfx/sane-backends
 "
 RDEPEND="${DEPEND}"
-
-# Not sure where this moved/who should install it in 4.7+
-if [[ ${PV} != *9999 ]]; then
-src_install() {
-	insinto "${KDEDIR}"/share/apps/cmake/modules
-	doins "${S}"/cmake/modules/FindKSane.cmake
-
-	kde4-meta_src_install
-}
-fi

diff --git a/kde-base/libkworkspace/libkworkspace-9999.ebuild b/kde-base/libkworkspace/libkworkspace-9999.ebuild
index 4ea8c29..0556dc5 100644
--- a/kde-base/libkworkspace/libkworkspace-9999.ebuild
+++ b/kde-base/libkworkspace/libkworkspace-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-workspace"
+KMNAME="kde-workspace"
 KMMODULE="libs/kworkspace"
 inherit kde4-meta
 

diff --git a/kde-base/liboxygenstyle/liboxygenstyle-9999.ebuild b/kde-base/liboxygenstyle/liboxygenstyle-9999.ebuild
index 570d89e..37bd8a7 100644
--- a/kde-base/liboxygenstyle/liboxygenstyle-9999.ebuild
+++ b/kde-base/liboxygenstyle/liboxygenstyle-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-workspace"
+KMNAME="kde-workspace"
 KMMODULE="libs/oxygen"
 inherit kde4-meta
 

diff --git a/kde-base/libplasmaclock/libplasmaclock-9999.ebuild b/kde-base/libplasmaclock/libplasmaclock-9999.ebuild
index d08c689..f3256dc 100644
--- a/kde-base/libplasmaclock/libplasmaclock-9999.ebuild
+++ b/kde-base/libplasmaclock/libplasmaclock-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-workspace"
+KMNAME="kde-workspace"
 KMMODULE="libs/plasmaclock"
 OPENGL_REQUIRED="optional"
 inherit kde4-meta

diff --git a/kde-base/libplasmagenericshell/libplasmagenericshell-9999.ebuild b/kde-base/libplasmagenericshell/libplasmagenericshell-9999.ebuild
index b648487..489e0a2 100644
--- a/kde-base/libplasmagenericshell/libplasmagenericshell-9999.ebuild
+++ b/kde-base/libplasmagenericshell/libplasmagenericshell-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-workspace"
+KMNAME="kde-workspace"
 KMMODULE="libs/plasmagenericshell"
 inherit kde4-meta
 

diff --git a/kde-base/libtaskmanager/libtaskmanager-9999.ebuild b/kde-base/libtaskmanager/libtaskmanager-9999.ebuild
index f83aea5..53e2f29 100644
--- a/kde-base/libtaskmanager/libtaskmanager-9999.ebuild
+++ b/kde-base/libtaskmanager/libtaskmanager-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-workspace"
+KMNAME="kde-workspace"
 KMMODULE="libs/taskmanager"
 inherit kde4-meta
 

diff --git a/kde-base/marble/marble-9999.ebuild b/kde-base/marble/marble-9999.ebuild
index 8d00cc0..cbabbe8 100644
--- a/kde-base/marble/marble-9999.ebuild
+++ b/kde-base/marble/marble-9999.ebuild
@@ -8,13 +8,7 @@ KDE_HANDBOOK="optional"
 CPPUNIT_REQUIRED="optional"
 PYTHON_DEPEND="python? 2"
 KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeedu"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass} python
+inherit kde4-base python
 
 DESCRIPTION="Generic geographical map widget"
 KEYWORDS=""
@@ -39,11 +33,11 @@ PATCHES=( "${FILESDIR}/${PN}-4.6.2-magic.patch" )
 
 pkg_setup() {
 	python_set_active_version 2
-	${kde_eclass}_pkg_setup
+	kde4-base_pkg_setup
 }
 
 src_prepare() {
-	${kde_eclass}_src_prepare
+	kde4-base_src_prepare
 	python_convert_shebangs -r $(python_get_version) .
 }
 
@@ -62,7 +56,7 @@ src_configure() {
 
 	find "${S}/marble/src/bindings/python/sip" -name "*.sip" | xargs -- sed -i 's/#include <marble\//#include </'
 
-	${kde_eclass}_src_configure
+	kde4-base_src_configure
 }
 
 src_install() {
@@ -70,5 +64,5 @@ src_install() {
 		insinto "${KDEDIR}"/share/apps/cmake/modules
 		doins "${S}"/cmake/modules/FindMarbleWidget.cmake
 	fi
-	${kde_eclass}_src_install
+	kde4-base_src_install
 }

diff --git a/kde-base/nepomuk/nepomuk-9999.ebuild b/kde-base/nepomuk/nepomuk-9999.ebuild
index 7d19593..dbaccb2 100644
--- a/kde-base/nepomuk/nepomuk-9999.ebuild
+++ b/kde-base/nepomuk/nepomuk-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-KMNAME="kdebase-runtime"
+KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="Nepomuk KDE4 client"

diff --git a/kde-base/nsplugins/nsplugins-9999.ebuild b/kde-base/nsplugins/nsplugins-9999.ebuild
index 13adc2d..12f735d 100644
--- a/kde-base/nsplugins/nsplugins-9999.ebuild
+++ b/kde-base/nsplugins/nsplugins-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-apps"
+KMNAME="kde-baseapps"
 inherit kde4-meta
 
 DESCRIPTION="Netscape plugins support for Konqueror."

diff --git a/kde-base/parley/parley-9999.ebuild b/kde-base/parley/parley-9999.ebuild
index 02b2692..42462dd 100644
--- a/kde-base/parley/parley-9999.ebuild
+++ b/kde-base/parley/parley-9999.ebuild
@@ -6,13 +6,7 @@ EAPI=4
 
 KDE_HANDBOOK="optional"
 KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeedu"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
+inherit kde4-base
 
 DESCRIPTION="KDE Educational: vocabulary trainer"
 KEYWORDS=""
@@ -31,5 +25,5 @@ src_configure() {
 		$(cmake-utils_use_with plasma)
 	)
 
-	${kde_eclass}_src_configure
+	kde4-base_src_configure
 }

diff --git a/kde-base/phonon-kde/phonon-kde-9999.ebuild b/kde-base/phonon-kde/phonon-kde-9999.ebuild
index 1174fbd..660822e 100644
--- a/kde-base/phonon-kde/phonon-kde-9999.ebuild
+++ b/kde-base/phonon-kde/phonon-kde-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-runtime"
+KMNAME="kde-runtime"
 KMMODULE="phonon"
 inherit kde4-meta
 

diff --git a/kde-base/plasma-apps/plasma-apps-9999.ebuild b/kde-base/plasma-apps/plasma-apps-9999.ebuild
index 6268cc5..4366cea 100644
--- a/kde-base/plasma-apps/plasma-apps-9999.ebuild
+++ b/kde-base/plasma-apps/plasma-apps-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-apps"
+KMNAME="kde-baseapps"
 KMMODULE="plasma"
 inherit kde4-meta
 

diff --git a/kde-base/plasma-runtime/plasma-runtime-9999.ebuild b/kde-base/plasma-runtime/plasma-runtime-9999.ebuild
index e69c62b..22525e8 100644
--- a/kde-base/plasma-runtime/plasma-runtime-9999.ebuild
+++ b/kde-base/plasma-runtime/plasma-runtime-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-runtime"
+KMNAME="kde-runtime"
 KMMODULE="plasma"
 DECLARATIVE_REQUIRED="always"
 inherit kde4-meta

diff --git a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
index 09b05ed..8cb482b 100644
--- a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI=3
 
 KDE_HANDBOOK="optional"
-KMNAME="kdebase-workspace"
+KMNAME="kde-workspace"
 KMMODULE="plasma"
 PYTHON_DEPEND="python? 2"
 inherit python kde4-meta

diff --git a/kde-base/powerdevil/powerdevil-9999.ebuild b/kde-base/powerdevil/powerdevil-9999.ebuild
index 5c90255..e78f052 100644
--- a/kde-base/powerdevil/powerdevil-9999.ebuild
+++ b/kde-base/powerdevil/powerdevil-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-workspace"
+KMNAME="kde-workspace"
 inherit kde4-meta
 
 DESCRIPTION="PowerDevil is an utility for KDE4 for Laptop Powermanagement."

diff --git a/kde-base/pykde4/pykde4-4.6.80.ebuild b/kde-base/pykde4/pykde4-4.6.80.ebuild
index 06c4fab..abd47c9 100644
--- a/kde-base/pykde4/pykde4-4.6.80.ebuild
+++ b/kde-base/pykde4/pykde4-4.6.80.ebuild
@@ -59,7 +59,7 @@ src_configure() {
 }
 
 src_install() {
-	use doc && HTML_DOCS=("${S}/${KMMODULE}/docs/html/")
+	use doc && HTML_DOCS=("${S}/docs/html/")
 
 	kde4-base_src_install
 

diff --git a/kde-base/pykde4/pykde4-9999.ebuild b/kde-base/pykde4/pykde4-9999.ebuild
index 671b1b0..cda5b5c 100644
--- a/kde-base/pykde4/pykde4-9999.ebuild
+++ b/kde-base/pykde4/pykde4-9999.ebuild
@@ -4,19 +4,12 @@
 
 EAPI=3
 
-KMNAME="kdebindings"
-if [[ ${PV} != *9999 ]]; then
-	KMMODULE="python/pykde4"
-else
-	# HACK HACK HACK
-	KMMODULE="."
-fi
 OPENGL_REQUIRED="always"
 PYTHON_USE_WITH="threads"
 RESTRICT_PYTHON_ABIS="2.4"
 KDE_SCM="git"
 EGIT_REPONAME="pykde4"
-inherit python kde4-meta
+inherit python kde4-base
 
 DESCRIPTION="Python bindings for KDE4"
 KEYWORDS=""
@@ -35,14 +28,14 @@ RDEPEND="${DEPEND}"
 
 pkg_setup() {
 	python_pkg_setup
-	kde4-meta_pkg_setup
+	kde4-base_pkg_setup
 }
 
 src_prepare() {
-	kde4-meta_src_prepare
+	kde4-base_src_prepare
 
 	if ! use examples; then
-		sed -e '/^ADD_SUBDIRECTORY(examples)/s/^/# DISABLED /' -i ${KMMODULE}/CMakeLists.txt \
+		sed -e '/^ADD_SUBDIRECTORY(examples)/s/^/# DISABLED /' -i CMakeLists.txt \
 			|| die "Failed to disable examples"
 	fi
 
@@ -62,20 +55,20 @@ src_configure() {
 		$(cmake-utils_use_with semantic-desktop KdepimLibs)
 	)
 
-	kde4-meta_src_configure
+	kde4-base_src_configure
 }
 
 src_install() {
-	use doc && HTML_DOCS=("${S}/${KMMODULE}/docs/html/")
+	use doc && HTML_DOCS=("${S}/docs/html/")
 
-	kde4-meta_src_install
+	kde4-base_src_install
 
 	python_convert_shebangs -q -r $(python_get_version) "${ED}"
 	python_clean_installation_image -q
 }
 
 pkg_postinst() {
-	kde4-meta_pkg_postinst
+	kde4-base_pkg_postinst
 
 	python_mod_optimize PyKDE4 PyQt4
 
@@ -88,7 +81,7 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	kde4-meta_pkg_postrm
+	kde4-base_pkg_postrm
 
 	python_mod_cleanup PyKDE4 PyQt4
 }

diff --git a/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-9999.ebuild b/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-9999.ebuild
index a846ced..d194121 100644
--- a/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-9999.ebuild
+++ b/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-workspace"
+KMNAME="kde-workspace"
 inherit kde4-meta
 
 DESCRIPTION="Helps integration of pure Qt applications with KDE Workspace"

diff --git a/kde-base/renamedlg-plugins/renamedlg-plugins-9999.ebuild b/kde-base/renamedlg-plugins/renamedlg-plugins-9999.ebuild
index 1df4749..9301aa5 100644
--- a/kde-base/renamedlg-plugins/renamedlg-plugins-9999.ebuild
+++ b/kde-base/renamedlg-plugins/renamedlg-plugins-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-runtime"
+KMNAME="kde-runtime"
 KMMODULE="renamedlgplugins"
 inherit kde4-meta
 

diff --git a/kde-base/rocs/rocs-9999.ebuild b/kde-base/rocs/rocs-9999.ebuild
index 4e8228f..75fa4e3 100644
--- a/kde-base/rocs/rocs-9999.ebuild
+++ b/kde-base/rocs/rocs-9999.ebuild
@@ -6,13 +6,7 @@ EAPI=4
 
 KDE_HANDBOOK="optional"
 KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeedu"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
+inherit kde4-base
 
 DESCRIPTION="KDE4 interface to work with Graph Theory"
 KEYWORDS=""

diff --git a/kde-base/solid-runtime/solid-runtime-9999.ebuild b/kde-base/solid-runtime/solid-runtime-9999.ebuild
index 03be6f0..8737978 100644
--- a/kde-base/solid-runtime/solid-runtime-9999.ebuild
+++ b/kde-base/solid-runtime/solid-runtime-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-runtime"
+KMNAME="kde-runtime"
 KMNOMODULE=true
 inherit kde4-meta
 

diff --git a/kde-base/solid/solid-9999.ebuild b/kde-base/solid/solid-9999.ebuild
index 962212a..874c6a9 100644
--- a/kde-base/solid/solid-9999.ebuild
+++ b/kde-base/solid/solid-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-KMNAME="kdebase-workspace"
+KMNAME="kde-workspace"
 CPPUNIT_REQUIRED="test"
 inherit kde4-meta
 

diff --git a/kde-base/step/step-9999.ebuild b/kde-base/step/step-9999.ebuild
index 771a3e8..6553601 100644
--- a/kde-base/step/step-9999.ebuild
+++ b/kde-base/step/step-9999.ebuild
@@ -6,14 +6,7 @@ EAPI=4
 
 KDE_HANDBOOK="optional"
 KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdeedu"
-	kde_eclass="kde4-meta"
-fi
-
-inherit ${kde_eclass}
+inherit kde4-base
 
 DESCRIPTION="The KDE physics simulator"
 KEYWORDS=""
@@ -37,5 +30,5 @@ src_configure() {
 		$(cmake-utils_use_with gsl)
 		$(cmake-utils_use_with qalculate)
 	)
-	${kde_eclass}_src_configure
+	kde4-base_src_configure
 }

diff --git a/kde-base/svgpart/svgpart-9999.ebuild b/kde-base/svgpart/svgpart-9999.ebuild
index 177bbe7..19fe321 100644
--- a/kde-base/svgpart/svgpart-9999.ebuild
+++ b/kde-base/svgpart/svgpart-9999.ebuild
@@ -5,13 +5,7 @@
 EAPI=4
 
 KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdegraphics"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
+inherit kde4-base
 
 DESCRIPTION="Svgpart is a kpart for viewing SVGs"
 KEYWORDS=""

diff --git a/kde-base/systemsettings/systemsettings-9999.ebuild b/kde-base/systemsettings/systemsettings-9999.ebuild
index a2b2713..327e6f8 100644
--- a/kde-base/systemsettings/systemsettings-9999.ebuild
+++ b/kde-base/systemsettings/systemsettings-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-KMNAME="kdebase-workspace"
+KMNAME="kde-workspace"
 OPENGL_REQUIRED="optional"
 inherit kde4-meta
 

diff --git a/kde-base/thumbnailers/thumbnailers-4.6.80.ebuild b/kde-base/thumbnailers/thumbnailers-4.6.80.ebuild
index 064a733..001a6d8 100644
--- a/kde-base/thumbnailers/thumbnailers-4.6.80.ebuild
+++ b/kde-base/thumbnailers/thumbnailers-4.6.80.ebuild
@@ -12,9 +12,6 @@ DESCRIPTION="KDE 4 thumbnail generators for PDF/PS files"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
-MY_P="kdegraphics-${P}"
-S="${WORKDIR}/${MY_P}"
-
 DEPEND="
 	$(add_kdebase_dep libkdcraw)
 	$(add_kdebase_dep libkexiv2)
@@ -23,3 +20,5 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 add_blocker kdegraphics-strigi-analyzer '<4.2.91'
+
+S="${WORKDIR}/${KMNAME}-${PV}"

diff --git a/kde-base/thumbnailers/thumbnailers-9999.ebuild b/kde-base/thumbnailers/thumbnailers-9999.ebuild
index 4267efa..cf8c140 100644
--- a/kde-base/thumbnailers/thumbnailers-9999.ebuild
+++ b/kde-base/thumbnailers/thumbnailers-9999.ebuild
@@ -5,25 +5,13 @@
 EAPI=4
 
 KDE_SCM="git"
-if [[ ${PV} == *9999 ]]; then
-	KMNAME="kdegraphics-thumbnailers"
-	kde_eclass="kde4-base"
-else
-	KMNAME="kdegraphics"
-	kde_eclass="kde4-meta"
-fi
-inherit ${kde_eclass}
+KMNAME="kdegraphics-thumbnailers"
+inherit kde4-base
 
 DESCRIPTION="KDE 4 thumbnail generators for PDF/PS files"
 KEYWORDS=""
 IUSE="debug"
 
-if [[ ${PV} != *9999 ]]; then
-KMEXTRACTONLY="
-	libs/mobipocket
-"
-fi
-
 DEPEND="
 	$(add_kdebase_dep libkdcraw)
 	$(add_kdebase_dep libkexiv2)