public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/kde:master commit in: kde-base/kwalletd/, kde-base/kreadconfig/, kde-base/libplasmagenericshell/, ...
@ 2011-02-10 17:55 Maciej Mrozowski
  0 siblings, 0 replies; 2+ messages in thread
From: Maciej Mrozowski @ 2011-02-10 17:55 UTC (permalink / raw
  To: gentoo-commits

commit:     34e8c52745c7b2df06af5452286ed1d0a5ea48b8
Author:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 10 17:51:15 2011 +0000
Commit:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 10 17:52:54 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=34e8c527

Revert my last three commits
This reverts commits: 7cad498d6e93ede07e5247aa13600df3bab40731, b1dc4d1616d287eebb332ae0fab5c50266038489 and 70b93e609c3174880e5239c57a0c93b38f2d4bcb.

---
 eclass/kde4-meta.eclass                            |   27 +++++++++-----------
 .../activitymanager-4.6.9999.ebuild                |    3 +-
 .../activitymanager/activitymanager-9999.ebuild    |    3 +-
 kde-base/attica/attica-4.6.9999.ebuild             |    3 +-
 kde-base/attica/attica-9999.ebuild                 |    3 +-
 kde-base/drkonqi/drkonqi-4.6.9999.ebuild           |    3 +-
 kde-base/drkonqi/drkonqi-9999.ebuild               |    3 +-
 .../freespacenotifier-4.6.9999.ebuild              |    3 +-
 .../freespacenotifier-9999.ebuild                  |    3 +-
 kde-base/kcheckpass/kcheckpass-4.6.9999.ebuild     |    3 +-
 kde-base/kcheckpass/kcheckpass-9999.ebuild         |    3 +-
 kde-base/kcminit/kcminit-4.6.9999.ebuild           |    3 +-
 kde-base/kcminit/kcminit-9999.ebuild               |    3 +-
 kde-base/kcmshell/kcmshell-4.6.9999.ebuild         |    3 +-
 kde-base/kcmshell/kcmshell-9999.ebuild             |    3 +-
 kde-base/kcontrol/kcontrol-4.6.9999.ebuild         |    3 +-
 kde-base/kcontrol/kcontrol-9999.ebuild             |    3 +-
 .../kdebase-cursors-4.6.9999.ebuild                |    3 +-
 .../kdebase-cursors/kdebase-cursors-9999.ebuild    |    3 +-
 kde-base/kdebase-data/kdebase-data-4.6.9999.ebuild |    3 +-
 kde-base/kdebase-data/kdebase-data-9999.ebuild     |    3 +-
 .../kdebase-desktoptheme-4.6.9999.ebuild           |    3 +-
 .../kdebase-desktoptheme-9999.ebuild               |    3 +-
 .../kdebase-kioslaves-4.6.9999.ebuild              |    3 +-
 .../kdebase-kioslaves-9999.ebuild                  |    3 +-
 .../kdebase-menu-icons-4.6.9999.ebuild             |    3 +-
 .../kdebase-menu-icons-9999.ebuild                 |    3 +-
 kde-base/kdebase-menu/kdebase-menu-4.6.9999.ebuild |    3 +-
 kde-base/kdebase-menu/kdebase-menu-9999.ebuild     |    3 +-
 .../kdebase-startkde-4.6.9999.ebuild               |    3 +-
 .../kdebase-startkde/kdebase-startkde-9999.ebuild  |    3 +-
 .../kdebase-wallpapers-4.6.9999.ebuild             |    3 +-
 .../kdebase-wallpapers-9999.ebuild                 |    3 +-
 kde-base/kdebugdialog/kdebugdialog-4.6.9999.ebuild |    3 +-
 kde-base/kdebugdialog/kdebugdialog-9999.ebuild     |    3 +-
 kde-base/kdesu/kdesu-4.6.9999.ebuild               |    3 +-
 kde-base/kdesu/kdesu-9999.ebuild                   |    3 +-
 kde-base/kdm/kdm-4.6.9999.ebuild                   |    3 +-
 kde-base/kdm/kdm-9999.ebuild                       |    3 +-
 .../kdontchangethehostname-4.6.9999.ebuild         |    3 +-
 .../kdontchangethehostname-9999.ebuild             |    3 +-
 .../keditfiletype/keditfiletype-4.6.9999.ebuild    |    3 +-
 kde-base/keditfiletype/keditfiletype-9999.ebuild   |    3 +-
 kde-base/kephal/kephal-4.6.9999.ebuild             |    3 +-
 kde-base/kephal/kephal-9999.ebuild                 |    3 +-
 kde-base/kfile/kfile-4.6.9999.ebuild               |    3 +-
 kde-base/kfile/kfile-9999.ebuild                   |    3 +-
 kde-base/kglobalaccel/kglobalaccel-4.6.9999.ebuild |    3 +-
 kde-base/kglobalaccel/kglobalaccel-9999.ebuild     |    3 +-
 kde-base/khelpcenter/khelpcenter-4.6.9999.ebuild   |    3 +-
 kde-base/khelpcenter/khelpcenter-9999.ebuild       |    3 +-
 kde-base/khotkeys/khotkeys-4.6.9999.ebuild         |    3 +-
 kde-base/khotkeys/khotkeys-9999.ebuild             |    3 +-
 kde-base/kiconfinder/kiconfinder-4.6.9999.ebuild   |    3 +-
 kde-base/kiconfinder/kiconfinder-9999.ebuild       |    3 +-
 kde-base/kinfocenter/kinfocenter-4.6.9999.ebuild   |    3 +-
 kde-base/kinfocenter/kinfocenter-9999.ebuild       |    3 +-
 kde-base/kioclient/kioclient-4.6.9999.ebuild       |    3 +-
 kde-base/kioclient/kioclient-9999.ebuild           |    3 +-
 kde-base/klipper/klipper-4.6.9999.ebuild           |    3 +-
 kde-base/klipper/klipper-9999.ebuild               |    3 +-
 kde-base/kmenuedit/kmenuedit-4.6.9999.ebuild       |    3 +-
 kde-base/kmenuedit/kmenuedit-9999.ebuild           |    3 +-
 .../kmimetypefinder-4.6.9999.ebuild                |    3 +-
 .../kmimetypefinder/kmimetypefinder-9999.ebuild    |    3 +-
 kde-base/knetattach/knetattach-4.6.9999.ebuild     |    3 +-
 kde-base/knetattach/knetattach-9999.ebuild         |    3 +-
 kde-base/knewstuff/knewstuff-4.6.9999.ebuild       |    3 +-
 kde-base/knewstuff/knewstuff-9999.ebuild           |    3 +-
 kde-base/knotify/knotify-4.6.9999.ebuild           |    3 +-
 kde-base/knotify/knotify-9999.ebuild               |    3 +-
 .../kpasswdserver/kpasswdserver-4.6.9999.ebuild    |    3 +-
 kde-base/kpasswdserver/kpasswdserver-9999.ebuild   |    3 +-
 kde-base/kquitapp/kquitapp-4.6.9999.ebuild         |    3 +-
 kde-base/kquitapp/kquitapp-9999.ebuild             |    3 +-
 kde-base/kreadconfig/kreadconfig-4.6.9999.ebuild   |    3 +-
 kde-base/kreadconfig/kreadconfig-9999.ebuild       |    3 +-
 kde-base/krunner/krunner-4.6.9999.ebuild           |    3 +-
 kde-base/krunner/krunner-9999.ebuild               |    3 +-
 kde-base/kscreensaver/kscreensaver-4.6.9999.ebuild |    3 +-
 kde-base/kscreensaver/kscreensaver-9999.ebuild     |    3 +-
 kde-base/ksmserver/ksmserver-4.6.9999.ebuild       |    3 +-
 kde-base/ksmserver/ksmserver-9999.ebuild           |    3 +-
 kde-base/ksplash/ksplash-4.6.9999.ebuild           |    3 +-
 kde-base/ksplash/ksplash-9999.ebuild               |    3 +-
 kde-base/kstart/kstart-4.6.9999.ebuild             |    3 +-
 kde-base/kstart/kstart-9999.ebuild                 |    3 +-
 .../kstartupconfig/kstartupconfig-4.6.9999.ebuild  |    3 +-
 kde-base/kstartupconfig/kstartupconfig-9999.ebuild |    3 +-
 kde-base/kstyles/kstyles-4.6.9999.ebuild           |    3 +-
 kde-base/kstyles/kstyles-9999.ebuild               |    3 +-
 kde-base/ksysguard/ksysguard-4.6.9999.ebuild       |    3 +-
 kde-base/ksysguard/ksysguard-9999.ebuild           |    3 +-
 kde-base/ksystraycmd/ksystraycmd-4.6.9999.ebuild   |    3 +-
 kde-base/ksystraycmd/ksystraycmd-9999.ebuild       |    3 +-
 kde-base/ktimezoned/ktimezoned-4.6.9999.ebuild     |    3 +-
 kde-base/ktimezoned/ktimezoned-9999.ebuild         |    3 +-
 .../ktraderclient/ktraderclient-4.6.9999.ebuild    |    3 +-
 kde-base/ktraderclient/ktraderclient-9999.ebuild   |    3 +-
 kde-base/kuiserver/kuiserver-4.6.9999.ebuild       |    3 +-
 kde-base/kuiserver/kuiserver-9999.ebuild           |    3 +-
 .../kurifilter-plugins-4.6.9999.ebuild             |    3 +-
 .../kurifilter-plugins-9999.ebuild                 |    3 +-
 kde-base/kwalletd/kwalletd-4.6.9999.ebuild         |    3 +-
 kde-base/kwalletd/kwalletd-9999.ebuild             |    3 +-
 kde-base/kwin/kwin-4.6.9999.ebuild                 |    3 +-
 kde-base/kwin/kwin-9999.ebuild                     |    3 +-
 kde-base/kwrited/kwrited-4.6.9999.ebuild           |    3 +-
 kde-base/kwrited/kwrited-9999.ebuild               |    3 +-
 .../libkworkspace/libkworkspace-4.6.9999.ebuild    |    3 +-
 kde-base/libkworkspace/libkworkspace-9999.ebuild   |    3 +-
 .../liboxygenstyle/liboxygenstyle-4.6.9999.ebuild  |    3 +-
 kde-base/liboxygenstyle/liboxygenstyle-9999.ebuild |    3 +-
 .../libplasmaclock/libplasmaclock-4.6.9999.ebuild  |    3 +-
 kde-base/libplasmaclock/libplasmaclock-9999.ebuild |    3 +-
 .../libplasmagenericshell-4.6.9999.ebuild          |    3 +-
 .../libplasmagenericshell-9999.ebuild              |    3 +-
 .../libtaskmanager/libtaskmanager-4.6.9999.ebuild  |    3 +-
 kde-base/libtaskmanager/libtaskmanager-9999.ebuild |    3 +-
 kde-base/nepomuk/nepomuk-4.6.9999.ebuild           |    3 +-
 kde-base/nepomuk/nepomuk-9999.ebuild               |    3 +-
 kde-base/phonon-kde/phonon-kde-4.6.9999.ebuild     |    3 +-
 kde-base/phonon-kde/phonon-kde-9999.ebuild         |    3 +-
 .../plasma-runtime/plasma-runtime-4.6.9999.ebuild  |    3 +-
 kde-base/plasma-runtime/plasma-runtime-9999.ebuild |    3 +-
 .../plasma-workspace-4.6.9999.ebuild               |    3 +-
 .../plasma-workspace/plasma-workspace-9999.ebuild  |    3 +-
 kde-base/powerdevil/powerdevil-4.6.9999.ebuild     |    3 +-
 kde-base/powerdevil/powerdevil-9999.ebuild         |    3 +-
 .../qguiplatformplugin_kde-4.6.9999.ebuild         |    3 +-
 .../qguiplatformplugin_kde-9999.ebuild             |    3 +-
 .../renamedlg-plugins-4.6.9999.ebuild              |    3 +-
 .../renamedlg-plugins-9999.ebuild                  |    3 +-
 .../solid-runtime/solid-runtime-4.6.9999.ebuild    |    3 +-
 kde-base/solid-runtime/solid-runtime-9999.ebuild   |    3 +-
 kde-base/solid/solid-4.6.9999.ebuild               |    3 +-
 kde-base/solid/solid-9999.ebuild                   |    3 +-
 .../systemsettings/systemsettings-4.6.9999.ebuild  |    3 +-
 kde-base/systemsettings/systemsettings-9999.ebuild |    3 +-
 139 files changed, 150 insertions(+), 291 deletions(-)

diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
index cacbbaa..349aa4d 100644
--- a/eclass/kde4-meta.eclass
+++ b/eclass/kde4-meta.eclass
@@ -20,7 +20,7 @@ EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_
 
 # Add dependencies that all packages in a certain module share.
 case ${KMNAME} in
-	kdebase|kdebase-apps|kdebase-workspace|kde-workspace|kdebase-runtime|kde-runtime|kdegraphics)
+	kdebase|kdebase-apps|kdebase-workspace|kdebase-runtime|kdegraphics)
 		COMMONDEPEND+=" >=media-libs/qimageblitz-0.0.4"
 		;;
 	kdepim|kdepim-runtime)
@@ -206,6 +206,11 @@ kde4-meta_src_extract() {
 				done
 				;;
 		esac
+
+		if [[ ${KMNAME} = kdebase-runtime && ${PN} != kdebase-data ]]; then
+			sed -i -e '/^install(PROGRAMS[[:space:]]*[^[:space:]]*\/kde4[[:space:]]/s/^/#DONOTINSTALL /' \
+				"${S}"/CMakeLists.txt || die "Sed to exclude bin/kde4 failed"
+		fi
 	else
 		local abort tarball tarfile f extractlist moduleprefix postfix
 
@@ -220,14 +225,6 @@ kde4-meta_src_extract() {
 				moduleprefix=apps/
 				KMTARPARAMS+=" --transform=s|apps/||"
 				;;
-			kde-runtime)
-				# Old tarball naming scheme
-				tarball="kdebase-runtime-${PV}.tar.${postfix}"
-				;;
-			kde-workspace)
-				# Old tarball naming scheme
-				tarball="kdebase-workspace-${PV}.tar.${postfix}"
-				;;
 			*)
 				# Create tarball name from module name (this is the default)
 				tarball="${KMNAME}-${PV}.tar.${postfix}"
@@ -327,11 +324,11 @@ kde4-meta_create_extractlists() {
 				config-apps.h.cmake
 				ConfigureChecks.cmake"
 			;;
-		kdebase-runtime|kde-runtime)
+		kdebase-runtime)
 			KMEXTRACTONLY+="
 				config-runtime.h.cmake"
 			;;
-		kdebase-workspace|kde-workspace)
+		kdebase-workspace)
 			KMEXTRACTONLY+="
 				config-unix.h.cmake
 				ConfigureChecks.cmake
@@ -389,7 +386,7 @@ kde4-meta_create_extractlists() {
 	esac
 	# Don't install cmake modules for split ebuilds, to avoid collisions.
 	case ${KMNAME} in
-		kdebase-runtime|kde-runtime|kdebase-workspace|kde-workspace|kdeedu|kdegames|kdegraphics)
+		kdebase-runtime|kdebase-workspace|kdeedu|kdegames|kdegraphics)
 			case ${PN} in
 				libkdegames|libkdeedu|libkworkspace)
 					KMEXTRA+="
@@ -553,7 +550,7 @@ kde4-meta_change_cmakelists() {
 	done
 
 	case ${KMNAME} in
-		kdebase-workspace|kde-workspace)
+		kdebase-workspace)
 			# COLLISION PROTECT section
 			# Install the startkde script just once, as a part of kde-base/kdebase-startkde,
 			# not as a part of every package.
@@ -565,10 +562,10 @@ kde4-meta_change_cmakelists() {
 			# Strip EXPORT feature section from workspace for KDE4 versions > 4.1.82
 			if [[ ${PN} != libkworkspace ]]; then
 				sed -e '/install(FILES ${CMAKE_CURRENT_BINARY_DIR}\/KDE4WorkspaceConfig.cmake/,/^[[:space:]]*FILE KDE4WorkspaceLibraryTargets.cmake )[[:space:]]*^/d' \
-					-i CMakeLists.txt || die "${LINENO}: sed died in ${KMNAME} strip config install and fix EXPORT section"
+					-i CMakeLists.txt || die "${LINENO}: sed died in kdebase-workspace strip config install and fix EXPORT section"
 			fi
 			;;
-		kdebase-runtime|kde-runtime)
+		kdebase-runtime)
 			# COLLISION PROTECT section
 			# Only install the kde4 script as part of kde-base/kdebase-data
 			if [[ ${PN} != kdebase-data && -f CMakeLists.txt ]]; then

diff --git a/kde-base/activitymanager/activitymanager-4.6.9999.ebuild b/kde-base/activitymanager/activitymanager-4.6.9999.ebuild
index f9c5d86..49d52c4 100644
--- a/kde-base/activitymanager/activitymanager-4.6.9999.ebuild
+++ b/kde-base/activitymanager/activitymanager-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 inherit kde4-meta
 
 DESCRIPTION="Activity manager"

diff --git a/kde-base/activitymanager/activitymanager-9999.ebuild b/kde-base/activitymanager/activitymanager-9999.ebuild
index f9c5d86..49d52c4 100644
--- a/kde-base/activitymanager/activitymanager-9999.ebuild
+++ b/kde-base/activitymanager/activitymanager-9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 inherit kde4-meta
 
 DESCRIPTION="Activity manager"

diff --git a/kde-base/attica/attica-4.6.9999.ebuild b/kde-base/attica/attica-4.6.9999.ebuild
index d12b675..66386c7 100644
--- a/kde-base/attica/attica-4.6.9999.ebuild
+++ b/kde-base/attica/attica-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 inherit kde4-meta
 
 DESCRIPTION="Open Collaboration Services provider management"

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

diff --git a/kde-base/drkonqi/drkonqi-4.6.9999.ebuild b/kde-base/drkonqi/drkonqi-4.6.9999.ebuild
index 4725db4..28f2bda 100644
--- a/kde-base/drkonqi/drkonqi-4.6.9999.ebuild
+++ b/kde-base/drkonqi/drkonqi-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE crash handler, gives the user feedback if a program crashed"

diff --git a/kde-base/drkonqi/drkonqi-9999.ebuild b/kde-base/drkonqi/drkonqi-9999.ebuild
index 4725db4..28f2bda 100644
--- a/kde-base/drkonqi/drkonqi-9999.ebuild
+++ b/kde-base/drkonqi/drkonqi-9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE crash handler, gives the user feedback if a program crashed"

diff --git a/kde-base/freespacenotifier/freespacenotifier-4.6.9999.ebuild b/kde-base/freespacenotifier/freespacenotifier-4.6.9999.ebuild
index 9a112ca..1420707 100644
--- a/kde-base/freespacenotifier/freespacenotifier-4.6.9999.ebuild
+++ b/kde-base/freespacenotifier/freespacenotifier-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-workspace"
 inherit kde4-meta
 
 DESCRIPTION="A module that monitors free disk space on the home dir"

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

diff --git a/kde-base/kcheckpass/kcheckpass-4.6.9999.ebuild b/kde-base/kcheckpass/kcheckpass-4.6.9999.ebuild
index 64121bb..0df6eb2 100644
--- a/kde-base/kcheckpass/kcheckpass-4.6.9999.ebuild
+++ b/kde-base/kcheckpass/kcheckpass-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-workspace"
 inherit kde4-meta
 
 DESCRIPTION="A simple password checker, used by any software in need of user authentication."

diff --git a/kde-base/kcheckpass/kcheckpass-9999.ebuild b/kde-base/kcheckpass/kcheckpass-9999.ebuild
index 64121bb..0df6eb2 100644
--- a/kde-base/kcheckpass/kcheckpass-9999.ebuild
+++ b/kde-base/kcheckpass/kcheckpass-9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-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-4.6.9999.ebuild b/kde-base/kcminit/kcminit-4.6.9999.ebuild
index 4382fc8..7ef8c55 100644
--- a/kde-base/kcminit/kcminit-4.6.9999.ebuild
+++ b/kde-base/kcminit/kcminit-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-workspace"
 inherit kde4-meta
 
 DESCRIPTION="KCMInit - runs startups initialization for Control Modules."

diff --git a/kde-base/kcminit/kcminit-9999.ebuild b/kde-base/kcminit/kcminit-9999.ebuild
index 4382fc8..7ef8c55 100644
--- a/kde-base/kcminit/kcminit-9999.ebuild
+++ b/kde-base/kcminit/kcminit-9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-workspace"
 inherit kde4-meta
 
 DESCRIPTION="KCMInit - runs startups initialization for Control Modules."

diff --git a/kde-base/kcmshell/kcmshell-4.6.9999.ebuild b/kde-base/kcmshell/kcmshell-4.6.9999.ebuild
index bc5caea..b5142d6 100644
--- a/kde-base/kcmshell/kcmshell-4.6.9999.ebuild
+++ b/kde-base/kcmshell/kcmshell-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KCMShell is a utility to host KDE control modules independently of SystemSettings."

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

diff --git a/kde-base/kcontrol/kcontrol-4.6.9999.ebuild b/kde-base/kcontrol/kcontrol-4.6.9999.ebuild
index 956bfc0..d8ce00e 100644
--- a/kde-base/kcontrol/kcontrol-4.6.9999.ebuild
+++ b/kde-base/kcontrol/kcontrol-4.6.9999.ebuild
@@ -5,8 +5,7 @@
 EAPI=3
 
 KDE_HANDBOOK="optional"
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 inherit kde4-meta
 
 DESCRIPTION="The KDE Control Center"

diff --git a/kde-base/kcontrol/kcontrol-9999.ebuild b/kde-base/kcontrol/kcontrol-9999.ebuild
index 956bfc0..d8ce00e 100644
--- a/kde-base/kcontrol/kcontrol-9999.ebuild
+++ b/kde-base/kcontrol/kcontrol-9999.ebuild
@@ -5,8 +5,7 @@
 EAPI=3
 
 KDE_HANDBOOK="optional"
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 inherit kde4-meta
 
 DESCRIPTION="The KDE Control Center"

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 adf5c9f..366b94f 100644
--- a/kde-base/kdebase-cursors/kdebase-cursors-4.6.9999.ebuild
+++ b/kde-base/kdebase-cursors/kdebase-cursors-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-workspace"
 KMEXTRA="cursors"
 KMNOMODULE="true"
 inherit kde4-meta

diff --git a/kde-base/kdebase-cursors/kdebase-cursors-9999.ebuild b/kde-base/kdebase-cursors/kdebase-cursors-9999.ebuild
index adf5c9f..366b94f 100644
--- a/kde-base/kdebase-cursors/kdebase-cursors-9999.ebuild
+++ b/kde-base/kdebase-cursors/kdebase-cursors-9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-workspace"
 KMEXTRA="cursors"
 KMNOMODULE="true"
 inherit kde4-meta

diff --git a/kde-base/kdebase-data/kdebase-data-4.6.9999.ebuild b/kde-base/kdebase-data/kdebase-data-4.6.9999.ebuild
index 3d61cf3..bd45488 100644
--- a/kde-base/kdebase-data/kdebase-data-4.6.9999.ebuild
+++ b/kde-base/kdebase-data/kdebase-data-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 KMNOMODULE="true"
 inherit kde4-meta
 

diff --git a/kde-base/kdebase-data/kdebase-data-9999.ebuild b/kde-base/kdebase-data/kdebase-data-9999.ebuild
index 3d61cf3..bd45488 100644
--- a/kde-base/kdebase-data/kdebase-data-9999.ebuild
+++ b/kde-base/kdebase-data/kdebase-data-9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 KMNOMODULE="true"
 inherit kde4-meta
 

diff --git a/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.6.9999.ebuild b/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.6.9999.ebuild
index a1ed6dc..3349299 100644
--- a/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.6.9999.ebuild
+++ b/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 KMMODULE="desktoptheme"
 inherit kde4-meta
 

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

diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.6.9999.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.6.9999.ebuild
index a324e1a..ece3ac7 100644
--- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.6.9999.ebuild
+++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.6.9999.ebuild
@@ -5,8 +5,7 @@
 EAPI=3
 
 KDE_HANDBOOK="optional"
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 KMMODULE="kioslave"
 inherit kde4-meta
 

diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-9999.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-9999.ebuild
index a324e1a..ece3ac7 100644
--- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-9999.ebuild
+++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-9999.ebuild
@@ -5,8 +5,7 @@
 EAPI=3
 
 KDE_HANDBOOK="optional"
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 KMMODULE="kioslave"
 inherit kde4-meta
 

diff --git a/kde-base/kdebase-menu-icons/kdebase-menu-icons-4.6.9999.ebuild b/kde-base/kdebase-menu-icons/kdebase-menu-icons-4.6.9999.ebuild
index b43058d..6613d0f 100644
--- a/kde-base/kdebase-menu-icons/kdebase-menu-icons-4.6.9999.ebuild
+++ b/kde-base/kdebase-menu-icons/kdebase-menu-icons-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 KMMODULE="menu"
 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 b43058d..6613d0f 100644
--- a/kde-base/kdebase-menu-icons/kdebase-menu-icons-9999.ebuild
+++ b/kde-base/kdebase-menu-icons/kdebase-menu-icons-9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 KMMODULE="menu"
 inherit kde4-meta
 

diff --git a/kde-base/kdebase-menu/kdebase-menu-4.6.9999.ebuild b/kde-base/kdebase-menu/kdebase-menu-4.6.9999.ebuild
index 1580e06..375bbf1 100644
--- a/kde-base/kdebase-menu/kdebase-menu-4.6.9999.ebuild
+++ b/kde-base/kdebase-menu/kdebase-menu-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 KMMODULE="kde-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 1580e06..375bbf1 100644
--- a/kde-base/kdebase-menu/kdebase-menu-9999.ebuild
+++ b/kde-base/kdebase-menu/kdebase-menu-9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 KMMODULE="kde-menu"
 inherit kde4-meta
 

diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.6.9999.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.6.9999.ebuild
index 030dd4f..a013174 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.6.9999.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-workspace"
 KMNOMODULE="true"
 inherit kde4-meta multilib prefix
 

diff --git a/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild
index 030dd4f..a013174 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-workspace"
 KMNOMODULE="true"
 inherit kde4-meta multilib prefix
 

diff --git a/kde-base/kdebase-wallpapers/kdebase-wallpapers-4.6.9999.ebuild b/kde-base/kdebase-wallpapers/kdebase-wallpapers-4.6.9999.ebuild
index bc585c1..ed62f92 100644
--- a/kde-base/kdebase-wallpapers/kdebase-wallpapers-4.6.9999.ebuild
+++ b/kde-base/kdebase-wallpapers/kdebase-wallpapers-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-workspace"
 KMMODULE="wallpapers"
 inherit kde4-meta
 

diff --git a/kde-base/kdebase-wallpapers/kdebase-wallpapers-9999.ebuild b/kde-base/kdebase-wallpapers/kdebase-wallpapers-9999.ebuild
index bc585c1..ed62f92 100644
--- a/kde-base/kdebase-wallpapers/kdebase-wallpapers-9999.ebuild
+++ b/kde-base/kdebase-wallpapers/kdebase-wallpapers-9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-workspace"
 KMMODULE="wallpapers"
 inherit kde4-meta
 

diff --git a/kde-base/kdebugdialog/kdebugdialog-4.6.9999.ebuild b/kde-base/kdebugdialog/kdebugdialog-4.6.9999.ebuild
index 1dfec08..052e860 100644
--- a/kde-base/kdebugdialog/kdebugdialog-4.6.9999.ebuild
+++ b/kde-base/kdebugdialog/kdebugdialog-4.6.9999.ebuild
@@ -5,8 +5,7 @@
 EAPI=3
 
 KDE_HANDBOOK="optional"
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE: A dialog box for setting preferences for debug output"

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

diff --git a/kde-base/kdesu/kdesu-4.6.9999.ebuild b/kde-base/kdesu/kdesu-4.6.9999.ebuild
index 0e92a06..4291511 100644
--- a/kde-base/kdesu/kdesu-4.6.9999.ebuild
+++ b/kde-base/kdesu/kdesu-4.6.9999.ebuild
@@ -5,8 +5,7 @@
 EAPI=3
 
 KDE_HANDBOOK="optional"
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 inherit kde4-meta
 
 # FIXME: Is default command ( su/sudo ) still configurable,

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

diff --git a/kde-base/kdm/kdm-4.6.9999.ebuild b/kde-base/kdm/kdm-4.6.9999.ebuild
index ab9af38..7d84d4f 100644
--- a/kde-base/kdm/kdm-4.6.9999.ebuild
+++ b/kde-base/kdm/kdm-4.6.9999.ebuild
@@ -5,8 +5,7 @@
 EAPI=3
 
 KDE_HANDBOOK="optional"
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-workspace"
 inherit kde4-meta flag-o-matic
 
 DESCRIPTION="KDE login manager, similar to xdm and gdm"

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

diff --git a/kde-base/kdontchangethehostname/kdontchangethehostname-4.6.9999.ebuild b/kde-base/kdontchangethehostname/kdontchangethehostname-4.6.9999.ebuild
index 372624b..4217b10 100644
--- a/kde-base/kdontchangethehostname/kdontchangethehostname-4.6.9999.ebuild
+++ b/kde-base/kdontchangethehostname/kdontchangethehostname-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 inherit kde4-meta
 
 DESCRIPTION="Tool to inform KDE about a change in hostname"

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

diff --git a/kde-base/keditfiletype/keditfiletype-4.6.9999.ebuild b/kde-base/keditfiletype/keditfiletype-4.6.9999.ebuild
index e74a9da..ed78a0d 100644
--- a/kde-base/keditfiletype/keditfiletype-4.6.9999.ebuild
+++ b/kde-base/keditfiletype/keditfiletype-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE mime/file type assocciation editor"

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

diff --git a/kde-base/kephal/kephal-4.6.9999.ebuild b/kde-base/kephal/kephal-4.6.9999.ebuild
index 80d6986..7a64000 100644
--- a/kde-base/kephal/kephal-4.6.9999.ebuild
+++ b/kde-base/kephal/kephal-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-workspace"
 KMMODULE="libs/kephal"
 inherit kde4-meta
 

diff --git a/kde-base/kephal/kephal-9999.ebuild b/kde-base/kephal/kephal-9999.ebuild
index 80d6986..7a64000 100644
--- a/kde-base/kephal/kephal-9999.ebuild
+++ b/kde-base/kephal/kephal-9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-workspace"
 KMMODULE="libs/kephal"
 inherit kde4-meta
 

diff --git a/kde-base/kfile/kfile-4.6.9999.ebuild b/kde-base/kfile/kfile-4.6.9999.ebuild
index db8293d..fc7aef4 100644
--- a/kde-base/kfile/kfile-4.6.9999.ebuild
+++ b/kde-base/kfile/kfile-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 inherit kde4-meta
 
 DESCRIPTION="A commandline frontend to KFileMetaInfo"

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

diff --git a/kde-base/kglobalaccel/kglobalaccel-4.6.9999.ebuild b/kde-base/kglobalaccel/kglobalaccel-4.6.9999.ebuild
index 0a3f27d..7d6b1b2 100644
--- a/kde-base/kglobalaccel/kglobalaccel-4.6.9999.ebuild
+++ b/kde-base/kglobalaccel/kglobalaccel-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE's Global Shortcut Daemon"

diff --git a/kde-base/kglobalaccel/kglobalaccel-9999.ebuild b/kde-base/kglobalaccel/kglobalaccel-9999.ebuild
index 0a3f27d..7d6b1b2 100644
--- a/kde-base/kglobalaccel/kglobalaccel-9999.ebuild
+++ b/kde-base/kglobalaccel/kglobalaccel-9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE's Global Shortcut Daemon"

diff --git a/kde-base/khelpcenter/khelpcenter-4.6.9999.ebuild b/kde-base/khelpcenter/khelpcenter-4.6.9999.ebuild
index 7c52cc1..13c0c27 100644
--- a/kde-base/khelpcenter/khelpcenter-4.6.9999.ebuild
+++ b/kde-base/khelpcenter/khelpcenter-4.6.9999.ebuild
@@ -5,8 +5,7 @@
 EAPI=3
 
 KDE_HANDBOOK="always"
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 inherit kde4-meta
 
 DESCRIPTION="The KDE Help Center"

diff --git a/kde-base/khelpcenter/khelpcenter-9999.ebuild b/kde-base/khelpcenter/khelpcenter-9999.ebuild
index 7c52cc1..13c0c27 100644
--- a/kde-base/khelpcenter/khelpcenter-9999.ebuild
+++ b/kde-base/khelpcenter/khelpcenter-9999.ebuild
@@ -5,8 +5,7 @@
 EAPI=3
 
 KDE_HANDBOOK="always"
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 inherit kde4-meta
 
 DESCRIPTION="The KDE Help Center"

diff --git a/kde-base/khotkeys/khotkeys-4.6.9999.ebuild b/kde-base/khotkeys/khotkeys-4.6.9999.ebuild
index dee1383..645dbfb 100644
--- a/kde-base/khotkeys/khotkeys-4.6.9999.ebuild
+++ b/kde-base/khotkeys/khotkeys-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-workspace"
 inherit kde4-meta
 
 DESCRIPTION="KDE: hotkey daemon"

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

diff --git a/kde-base/kiconfinder/kiconfinder-4.6.9999.ebuild b/kde-base/kiconfinder/kiconfinder-4.6.9999.ebuild
index 185268e..f0b0335 100644
--- a/kde-base/kiconfinder/kiconfinder-4.6.9999.ebuild
+++ b/kde-base/kiconfinder/kiconfinder-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 inherit kde4-meta
 
 DESCRIPTION="Finds an icon based on its name"

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

diff --git a/kde-base/kinfocenter/kinfocenter-4.6.9999.ebuild b/kde-base/kinfocenter/kinfocenter-4.6.9999.ebuild
index 099ee8f..78bc90e 100644
--- a/kde-base/kinfocenter/kinfocenter-4.6.9999.ebuild
+++ b/kde-base/kinfocenter/kinfocenter-4.6.9999.ebuild
@@ -5,8 +5,7 @@
 EAPI=3
 
 KDE_HANDBOOK="optional"
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-workspace"
 OPENGL_REQUIRED="optional"
 inherit kde4-meta
 

diff --git a/kde-base/kinfocenter/kinfocenter-9999.ebuild b/kde-base/kinfocenter/kinfocenter-9999.ebuild
index 099ee8f..78bc90e 100644
--- a/kde-base/kinfocenter/kinfocenter-9999.ebuild
+++ b/kde-base/kinfocenter/kinfocenter-9999.ebuild
@@ -5,8 +5,7 @@
 EAPI=3
 
 KDE_HANDBOOK="optional"
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-workspace"
 OPENGL_REQUIRED="optional"
 inherit kde4-meta
 

diff --git a/kde-base/kioclient/kioclient-4.6.9999.ebuild b/kde-base/kioclient/kioclient-4.6.9999.ebuild
index bfe193c..2d454bb 100644
--- a/kde-base/kioclient/kioclient-4.6.9999.ebuild
+++ b/kde-base/kioclient/kioclient-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 inherit kde4-meta
 
 DESCRIPTION="Command-line tool for network-transparent operations"

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

diff --git a/kde-base/klipper/klipper-4.6.9999.ebuild b/kde-base/klipper/klipper-4.6.9999.ebuild
index cb28bb9..8c3c239 100644
--- a/kde-base/klipper/klipper-4.6.9999.ebuild
+++ b/kde-base/klipper/klipper-4.6.9999.ebuild
@@ -5,8 +5,7 @@
 EAPI=3
 
 KDE_HANDBOOK="optional"
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-workspace"
 inherit kde4-meta
 
 DESCRIPTION="Applet for KDE and X clipboard management"

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

diff --git a/kde-base/kmenuedit/kmenuedit-4.6.9999.ebuild b/kde-base/kmenuedit/kmenuedit-4.6.9999.ebuild
index 1637ff1..d223634 100644
--- a/kde-base/kmenuedit/kmenuedit-4.6.9999.ebuild
+++ b/kde-base/kmenuedit/kmenuedit-4.6.9999.ebuild
@@ -5,8 +5,7 @@
 EAPI=3
 
 KDE_HANDBOOK="optional"
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-workspace"
 inherit kde4-meta
 
 DESCRIPTION="KDE menu editor"

diff --git a/kde-base/kmenuedit/kmenuedit-9999.ebuild b/kde-base/kmenuedit/kmenuedit-9999.ebuild
index 1637ff1..d223634 100644
--- a/kde-base/kmenuedit/kmenuedit-9999.ebuild
+++ b/kde-base/kmenuedit/kmenuedit-9999.ebuild
@@ -5,8 +5,7 @@
 EAPI=3
 
 KDE_HANDBOOK="optional"
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-workspace"
 inherit kde4-meta
 
 DESCRIPTION="KDE menu editor"

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

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

diff --git a/kde-base/knetattach/knetattach-4.6.9999.ebuild b/kde-base/knetattach/knetattach-4.6.9999.ebuild
index 23b8909..6f8830a 100644
--- a/kde-base/knetattach/knetattach-4.6.9999.ebuild
+++ b/kde-base/knetattach/knetattach-4.6.9999.ebuild
@@ -5,8 +5,7 @@
 EAPI=3
 
 KDE_HANDBOOK="optional"
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE network wizard"

diff --git a/kde-base/knetattach/knetattach-9999.ebuild b/kde-base/knetattach/knetattach-9999.ebuild
index 23b8909..6f8830a 100644
--- a/kde-base/knetattach/knetattach-9999.ebuild
+++ b/kde-base/knetattach/knetattach-9999.ebuild
@@ -5,8 +5,7 @@
 EAPI=3
 
 KDE_HANDBOOK="optional"
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE network wizard"

diff --git a/kde-base/knewstuff/knewstuff-4.6.9999.ebuild b/kde-base/knewstuff/knewstuff-4.6.9999.ebuild
index 61d79b3..92200a6 100644
--- a/kde-base/knewstuff/knewstuff-4.6.9999.ebuild
+++ b/kde-base/knewstuff/knewstuff-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE4 software to download and upload 'new stuff'"

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

diff --git a/kde-base/knotify/knotify-4.6.9999.ebuild b/kde-base/knotify/knotify-4.6.9999.ebuild
index 049553d..c7b9701 100644
--- a/kde-base/knotify/knotify-4.6.9999.ebuild
+++ b/kde-base/knotify/knotify-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 inherit kde4-meta
 
 DESCRIPTION="The KDE notification daemon."

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

diff --git a/kde-base/kpasswdserver/kpasswdserver-4.6.9999.ebuild b/kde-base/kpasswdserver/kpasswdserver-4.6.9999.ebuild
index 14d8b7b..a430a6e 100644
--- a/kde-base/kpasswdserver/kpasswdserver-4.6.9999.ebuild
+++ b/kde-base/kpasswdserver/kpasswdserver-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDED Password Module"

diff --git a/kde-base/kpasswdserver/kpasswdserver-9999.ebuild b/kde-base/kpasswdserver/kpasswdserver-9999.ebuild
index 14d8b7b..a430a6e 100644
--- a/kde-base/kpasswdserver/kpasswdserver-9999.ebuild
+++ b/kde-base/kpasswdserver/kpasswdserver-9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDED Password Module"

diff --git a/kde-base/kquitapp/kquitapp-4.6.9999.ebuild b/kde-base/kquitapp/kquitapp-4.6.9999.ebuild
index a4c9e27..31504ad 100644
--- a/kde-base/kquitapp/kquitapp-4.6.9999.ebuild
+++ b/kde-base/kquitapp/kquitapp-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 inherit kde4-meta
 
 DESCRIPTION="A CLI application quitter"

diff --git a/kde-base/kquitapp/kquitapp-9999.ebuild b/kde-base/kquitapp/kquitapp-9999.ebuild
index a4c9e27..31504ad 100644
--- a/kde-base/kquitapp/kquitapp-9999.ebuild
+++ b/kde-base/kquitapp/kquitapp-9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 inherit kde4-meta
 
 DESCRIPTION="A CLI application quitter"

diff --git a/kde-base/kreadconfig/kreadconfig-4.6.9999.ebuild b/kde-base/kreadconfig/kreadconfig-4.6.9999.ebuild
index 7fbfba9..93a0ae0 100644
--- a/kde-base/kreadconfig/kreadconfig-4.6.9999.ebuild
+++ b/kde-base/kreadconfig/kreadconfig-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE: A command-line tool to read KConfig entries"

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

diff --git a/kde-base/krunner/krunner-4.6.9999.ebuild b/kde-base/krunner/krunner-4.6.9999.ebuild
index 294db4b..57f49f9 100644
--- a/kde-base/krunner/krunner-4.6.9999.ebuild
+++ b/kde-base/krunner/krunner-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-workspace"
 OPENGL_REQUIRED="optional"
 inherit kde4-meta
 

diff --git a/kde-base/krunner/krunner-9999.ebuild b/kde-base/krunner/krunner-9999.ebuild
index 294db4b..57f49f9 100644
--- a/kde-base/krunner/krunner-9999.ebuild
+++ b/kde-base/krunner/krunner-9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-workspace"
 OPENGL_REQUIRED="optional"
 inherit kde4-meta
 

diff --git a/kde-base/kscreensaver/kscreensaver-4.6.9999.ebuild b/kde-base/kscreensaver/kscreensaver-4.6.9999.ebuild
index f5e3a7c..50a9af6 100644
--- a/kde-base/kscreensaver/kscreensaver-4.6.9999.ebuild
+++ b/kde-base/kscreensaver/kscreensaver-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-workspace"
 OPENGL_REQUIRED="optional"
 inherit kde4-meta
 

diff --git a/kde-base/kscreensaver/kscreensaver-9999.ebuild b/kde-base/kscreensaver/kscreensaver-9999.ebuild
index f5e3a7c..50a9af6 100644
--- a/kde-base/kscreensaver/kscreensaver-9999.ebuild
+++ b/kde-base/kscreensaver/kscreensaver-9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-workspace"
 OPENGL_REQUIRED="optional"
 inherit kde4-meta
 

diff --git a/kde-base/ksmserver/ksmserver-4.6.9999.ebuild b/kde-base/ksmserver/ksmserver-4.6.9999.ebuild
index fda6cf1..1e4b21a 100644
--- a/kde-base/ksmserver/ksmserver-4.6.9999.ebuild
+++ b/kde-base/ksmserver/ksmserver-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-workspace"
 inherit kde4-meta
 
 DESCRIPTION="The reliable KDE session manager that talks the standard X11R6"

diff --git a/kde-base/ksmserver/ksmserver-9999.ebuild b/kde-base/ksmserver/ksmserver-9999.ebuild
index fda6cf1..1e4b21a 100644
--- a/kde-base/ksmserver/ksmserver-9999.ebuild
+++ b/kde-base/ksmserver/ksmserver-9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-workspace"
 inherit kde4-meta
 
 DESCRIPTION="The reliable KDE session manager that talks the standard X11R6"

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

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

diff --git a/kde-base/kstart/kstart-4.6.9999.ebuild b/kde-base/kstart/kstart-4.6.9999.ebuild
index fb53110..a0c71aa 100644
--- a/kde-base/kstart/kstart-4.6.9999.ebuild
+++ b/kde-base/kstart/kstart-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE: Utility to launch applications with special window properties"

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

diff --git a/kde-base/kstartupconfig/kstartupconfig-4.6.9999.ebuild b/kde-base/kstartupconfig/kstartupconfig-4.6.9999.ebuild
index e505f41..c27d44a 100644
--- a/kde-base/kstartupconfig/kstartupconfig-4.6.9999.ebuild
+++ b/kde-base/kstartupconfig/kstartupconfig-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-workspace"
 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 e505f41..c27d44a 100644
--- a/kde-base/kstartupconfig/kstartupconfig-9999.ebuild
+++ b/kde-base/kstartupconfig/kstartupconfig-9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-workspace"
 inherit kde4-meta
 
 DESCRIPTION="KDE: Utility to launch applications with special window properties"

diff --git a/kde-base/kstyles/kstyles-4.6.9999.ebuild b/kde-base/kstyles/kstyles-4.6.9999.ebuild
index 9375581..7ccc2fc 100644
--- a/kde-base/kstyles/kstyles-4.6.9999.ebuild
+++ b/kde-base/kstyles/kstyles-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-workspace"
 inherit kde4-meta
 
 DESCRIPTION="KDE: A set of different KDE styles."

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

diff --git a/kde-base/ksysguard/ksysguard-4.6.9999.ebuild b/kde-base/ksysguard/ksysguard-4.6.9999.ebuild
index 1d6573a..ea55ee9 100644
--- a/kde-base/ksysguard/ksysguard-4.6.9999.ebuild
+++ b/kde-base/ksysguard/ksysguard-4.6.9999.ebuild
@@ -5,8 +5,7 @@
 EAPI=3
 
 KDE_HANDBOOK="optional"
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-workspace"
 CPPUNIT_REQUIRED="optional"
 VIRTUALX_REQUIRED="optional"
 inherit kde4-meta

diff --git a/kde-base/ksysguard/ksysguard-9999.ebuild b/kde-base/ksysguard/ksysguard-9999.ebuild
index 1d6573a..ea55ee9 100644
--- a/kde-base/ksysguard/ksysguard-9999.ebuild
+++ b/kde-base/ksysguard/ksysguard-9999.ebuild
@@ -5,8 +5,7 @@
 EAPI=3
 
 KDE_HANDBOOK="optional"
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-workspace"
 CPPUNIT_REQUIRED="optional"
 VIRTUALX_REQUIRED="optional"
 inherit kde4-meta

diff --git a/kde-base/ksystraycmd/ksystraycmd-4.6.9999.ebuild b/kde-base/ksystraycmd/ksystraycmd-4.6.9999.ebuild
index e38d887..2c321e2 100644
--- a/kde-base/ksystraycmd/ksystraycmd-4.6.9999.ebuild
+++ b/kde-base/ksystraycmd/ksystraycmd-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-workspace"
 inherit kde4-meta
 
 DESCRIPTION="Ksystraycmd embeds applications given as argument into the system tray."

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

diff --git a/kde-base/ktimezoned/ktimezoned-4.6.9999.ebuild b/kde-base/ktimezoned/ktimezoned-4.6.9999.ebuild
index 47c7b28..b782e37 100644
--- a/kde-base/ktimezoned/ktimezoned-4.6.9999.ebuild
+++ b/kde-base/ktimezoned/ktimezoned-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE: Timezone daemon"

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

diff --git a/kde-base/ktraderclient/ktraderclient-4.6.9999.ebuild b/kde-base/ktraderclient/ktraderclient-4.6.9999.ebuild
index 7a3e7f7..98574bc 100644
--- a/kde-base/ktraderclient/ktraderclient-4.6.9999.ebuild
+++ b/kde-base/ktraderclient/ktraderclient-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 inherit kde4-meta
 
 DESCRIPTION="A command-line tool for querying the KDE trader system"

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

diff --git a/kde-base/kuiserver/kuiserver-4.6.9999.ebuild b/kde-base/kuiserver/kuiserver-4.6.9999.ebuild
index ae32781..c66b7e4 100644
--- a/kde-base/kuiserver/kuiserver-4.6.9999.ebuild
+++ b/kde-base/kuiserver/kuiserver-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE: Progress Info UI server"

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

diff --git a/kde-base/kurifilter-plugins/kurifilter-plugins-4.6.9999.ebuild b/kde-base/kurifilter-plugins/kurifilter-plugins-4.6.9999.ebuild
index b31fc9a..2871e54 100644
--- a/kde-base/kurifilter-plugins/kurifilter-plugins-4.6.9999.ebuild
+++ b/kde-base/kurifilter-plugins/kurifilter-plugins-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE: Plugins to manage filtering URIs."

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

diff --git a/kde-base/kwalletd/kwalletd-4.6.9999.ebuild b/kde-base/kwalletd/kwalletd-4.6.9999.ebuild
index d65f655..ea69ad2 100644
--- a/kde-base/kwalletd/kwalletd-4.6.9999.ebuild
+++ b/kde-base/kwalletd/kwalletd-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE Password Server"

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

diff --git a/kde-base/kwin/kwin-4.6.9999.ebuild b/kde-base/kwin/kwin-4.6.9999.ebuild
index 8ee2c46..83ac6cf 100644
--- a/kde-base/kwin/kwin-4.6.9999.ebuild
+++ b/kde-base/kwin/kwin-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-workspace"
 OPENGL_REQUIRED="optional"
 inherit kde4-meta
 

diff --git a/kde-base/kwin/kwin-9999.ebuild b/kde-base/kwin/kwin-9999.ebuild
index 8ee2c46..83ac6cf 100644
--- a/kde-base/kwin/kwin-9999.ebuild
+++ b/kde-base/kwin/kwin-9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-workspace"
 OPENGL_REQUIRED="optional"
 inherit kde4-meta
 

diff --git a/kde-base/kwrited/kwrited-4.6.9999.ebuild b/kde-base/kwrited/kwrited-4.6.9999.ebuild
index d2c9659..b3cce15 100644
--- a/kde-base/kwrited/kwrited-4.6.9999.ebuild
+++ b/kde-base/kwrited/kwrited-4.6.9999.ebuild
@@ -3,8 +3,7 @@
 # $Header: $
 
 EAPI=3
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-workspace"
 inherit kde4-meta
 
 DESCRIPTION="KDE daemon listening for wall and write messages."

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

diff --git a/kde-base/libkworkspace/libkworkspace-4.6.9999.ebuild b/kde-base/libkworkspace/libkworkspace-4.6.9999.ebuild
index 1cc21f0..f158754 100644
--- a/kde-base/libkworkspace/libkworkspace-4.6.9999.ebuild
+++ b/kde-base/libkworkspace/libkworkspace-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-workspace"
 KMMODULE="libs/kworkspace"
 inherit kde4-meta
 

diff --git a/kde-base/libkworkspace/libkworkspace-9999.ebuild b/kde-base/libkworkspace/libkworkspace-9999.ebuild
index 1cc21f0..f158754 100644
--- a/kde-base/libkworkspace/libkworkspace-9999.ebuild
+++ b/kde-base/libkworkspace/libkworkspace-9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-workspace"
 KMMODULE="libs/kworkspace"
 inherit kde4-meta
 

diff --git a/kde-base/liboxygenstyle/liboxygenstyle-4.6.9999.ebuild b/kde-base/liboxygenstyle/liboxygenstyle-4.6.9999.ebuild
index ec76ce7..c23cdab 100644
--- a/kde-base/liboxygenstyle/liboxygenstyle-4.6.9999.ebuild
+++ b/kde-base/liboxygenstyle/liboxygenstyle-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-workspace"
 KMMODULE="libs/oxygen"
 inherit kde4-meta
 

diff --git a/kde-base/liboxygenstyle/liboxygenstyle-9999.ebuild b/kde-base/liboxygenstyle/liboxygenstyle-9999.ebuild
index ec76ce7..c23cdab 100644
--- a/kde-base/liboxygenstyle/liboxygenstyle-9999.ebuild
+++ b/kde-base/liboxygenstyle/liboxygenstyle-9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-workspace"
 KMMODULE="libs/oxygen"
 inherit kde4-meta
 

diff --git a/kde-base/libplasmaclock/libplasmaclock-4.6.9999.ebuild b/kde-base/libplasmaclock/libplasmaclock-4.6.9999.ebuild
index 09d9e0e..3b3b9bb 100644
--- a/kde-base/libplasmaclock/libplasmaclock-4.6.9999.ebuild
+++ b/kde-base/libplasmaclock/libplasmaclock-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-workspace"
 KMMODULE="libs/plasmaclock"
 OPENGL_REQUIRED="optional"
 inherit kde4-meta

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

diff --git a/kde-base/libplasmagenericshell/libplasmagenericshell-4.6.9999.ebuild b/kde-base/libplasmagenericshell/libplasmagenericshell-4.6.9999.ebuild
index 8665d3b..bf0e774 100644
--- a/kde-base/libplasmagenericshell/libplasmagenericshell-4.6.9999.ebuild
+++ b/kde-base/libplasmagenericshell/libplasmagenericshell-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-workspace"
 KMMODULE="libs/plasmagenericshell"
 inherit kde4-meta
 

diff --git a/kde-base/libplasmagenericshell/libplasmagenericshell-9999.ebuild b/kde-base/libplasmagenericshell/libplasmagenericshell-9999.ebuild
index 0006c15..615ff30 100644
--- a/kde-base/libplasmagenericshell/libplasmagenericshell-9999.ebuild
+++ b/kde-base/libplasmagenericshell/libplasmagenericshell-9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-workspace"
 KMMODULE="libs/plasmagenericshell"
 inherit kde4-meta
 

diff --git a/kde-base/libtaskmanager/libtaskmanager-4.6.9999.ebuild b/kde-base/libtaskmanager/libtaskmanager-4.6.9999.ebuild
index b01ec27..ad8f869 100644
--- a/kde-base/libtaskmanager/libtaskmanager-4.6.9999.ebuild
+++ b/kde-base/libtaskmanager/libtaskmanager-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-workspace"
 KMMODULE="libs/taskmanager"
 inherit kde4-meta
 

diff --git a/kde-base/libtaskmanager/libtaskmanager-9999.ebuild b/kde-base/libtaskmanager/libtaskmanager-9999.ebuild
index b01ec27..ad8f869 100644
--- a/kde-base/libtaskmanager/libtaskmanager-9999.ebuild
+++ b/kde-base/libtaskmanager/libtaskmanager-9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-workspace"
 KMMODULE="libs/taskmanager"
 inherit kde4-meta
 

diff --git a/kde-base/nepomuk/nepomuk-4.6.9999.ebuild b/kde-base/nepomuk/nepomuk-4.6.9999.ebuild
index 83fe484..53ac293 100644
--- a/kde-base/nepomuk/nepomuk-4.6.9999.ebuild
+++ b/kde-base/nepomuk/nepomuk-4.6.9999.ebuild
@@ -5,8 +5,7 @@
 EAPI=3
 
 KDE_HANDBOOK="optional"
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 inherit kde4-meta
 
 DESCRIPTION="Nepomuk KDE4 client"

diff --git a/kde-base/nepomuk/nepomuk-9999.ebuild b/kde-base/nepomuk/nepomuk-9999.ebuild
index 83fe484..53ac293 100644
--- a/kde-base/nepomuk/nepomuk-9999.ebuild
+++ b/kde-base/nepomuk/nepomuk-9999.ebuild
@@ -5,8 +5,7 @@
 EAPI=3
 
 KDE_HANDBOOK="optional"
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 inherit kde4-meta
 
 DESCRIPTION="Nepomuk KDE4 client"

diff --git a/kde-base/phonon-kde/phonon-kde-4.6.9999.ebuild b/kde-base/phonon-kde/phonon-kde-4.6.9999.ebuild
index b508110..64a7376 100644
--- a/kde-base/phonon-kde/phonon-kde-4.6.9999.ebuild
+++ b/kde-base/phonon-kde/phonon-kde-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 KMMODULE="phonon"
 inherit kde4-meta
 

diff --git a/kde-base/phonon-kde/phonon-kde-9999.ebuild b/kde-base/phonon-kde/phonon-kde-9999.ebuild
index b508110..64a7376 100644
--- a/kde-base/phonon-kde/phonon-kde-9999.ebuild
+++ b/kde-base/phonon-kde/phonon-kde-9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 KMMODULE="phonon"
 inherit kde4-meta
 

diff --git a/kde-base/plasma-runtime/plasma-runtime-4.6.9999.ebuild b/kde-base/plasma-runtime/plasma-runtime-4.6.9999.ebuild
index 610d88d..9ec6c36 100644
--- a/kde-base/plasma-runtime/plasma-runtime-4.6.9999.ebuild
+++ b/kde-base/plasma-runtime/plasma-runtime-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 KMMODULE="plasma"
 DECLARATIVE_REQUIRED="always"
 inherit kde4-meta

diff --git a/kde-base/plasma-runtime/plasma-runtime-9999.ebuild b/kde-base/plasma-runtime/plasma-runtime-9999.ebuild
index 610d88d..9ec6c36 100644
--- a/kde-base/plasma-runtime/plasma-runtime-9999.ebuild
+++ b/kde-base/plasma-runtime/plasma-runtime-9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 KMMODULE="plasma"
 DECLARATIVE_REQUIRED="always"
 inherit kde4-meta

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

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

diff --git a/kde-base/powerdevil/powerdevil-4.6.9999.ebuild b/kde-base/powerdevil/powerdevil-4.6.9999.ebuild
index 21e802d..7301b9c 100644
--- a/kde-base/powerdevil/powerdevil-4.6.9999.ebuild
+++ b/kde-base/powerdevil/powerdevil-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-workspace"
 inherit kde4-meta
 
 DESCRIPTION="PowerDevil is an utility for KDE4 for Laptop Powermanagement."

diff --git a/kde-base/powerdevil/powerdevil-9999.ebuild b/kde-base/powerdevil/powerdevil-9999.ebuild
index 21e802d..7301b9c 100644
--- a/kde-base/powerdevil/powerdevil-9999.ebuild
+++ b/kde-base/powerdevil/powerdevil-9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-workspace"
 inherit kde4-meta
 
 DESCRIPTION="PowerDevil is an utility for KDE4 for Laptop Powermanagement."

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

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

diff --git a/kde-base/renamedlg-plugins/renamedlg-plugins-4.6.9999.ebuild b/kde-base/renamedlg-plugins/renamedlg-plugins-4.6.9999.ebuild
index b670c77..e5461cb 100644
--- a/kde-base/renamedlg-plugins/renamedlg-plugins-4.6.9999.ebuild
+++ b/kde-base/renamedlg-plugins/renamedlg-plugins-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 KMMODULE="renamedlgplugins"
 inherit kde4-meta
 

diff --git a/kde-base/renamedlg-plugins/renamedlg-plugins-9999.ebuild b/kde-base/renamedlg-plugins/renamedlg-plugins-9999.ebuild
index b670c77..e5461cb 100644
--- a/kde-base/renamedlg-plugins/renamedlg-plugins-9999.ebuild
+++ b/kde-base/renamedlg-plugins/renamedlg-plugins-9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 KMMODULE="renamedlgplugins"
 inherit kde4-meta
 

diff --git a/kde-base/solid-runtime/solid-runtime-4.6.9999.ebuild b/kde-base/solid-runtime/solid-runtime-4.6.9999.ebuild
index bf7086b..6a2b1b3 100644
--- a/kde-base/solid-runtime/solid-runtime-4.6.9999.ebuild
+++ b/kde-base/solid-runtime/solid-runtime-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 KMNOMODULE=true
 inherit kde4-meta
 

diff --git a/kde-base/solid-runtime/solid-runtime-9999.ebuild b/kde-base/solid-runtime/solid-runtime-9999.ebuild
index bf7086b..6a2b1b3 100644
--- a/kde-base/solid-runtime/solid-runtime-9999.ebuild
+++ b/kde-base/solid-runtime/solid-runtime-9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 KMNOMODULE=true
 inherit kde4-meta
 

diff --git a/kde-base/solid/solid-4.6.9999.ebuild b/kde-base/solid/solid-4.6.9999.ebuild
index b9bfb7a..f95f33b 100644
--- a/kde-base/solid/solid-4.6.9999.ebuild
+++ b/kde-base/solid/solid-4.6.9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-workspace"
 CPPUNIT_REQUIRED="test"
 inherit kde4-meta
 

diff --git a/kde-base/solid/solid-9999.ebuild b/kde-base/solid/solid-9999.ebuild
index b9bfb7a..f95f33b 100644
--- a/kde-base/solid/solid-9999.ebuild
+++ b/kde-base/solid/solid-9999.ebuild
@@ -4,8 +4,7 @@
 
 EAPI=3
 
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-workspace"
 CPPUNIT_REQUIRED="test"
 inherit kde4-meta
 

diff --git a/kde-base/systemsettings/systemsettings-4.6.9999.ebuild b/kde-base/systemsettings/systemsettings-4.6.9999.ebuild
index 54487b4..06b5b40 100644
--- a/kde-base/systemsettings/systemsettings-4.6.9999.ebuild
+++ b/kde-base/systemsettings/systemsettings-4.6.9999.ebuild
@@ -5,8 +5,7 @@
 EAPI=3
 
 KDE_HANDBOOK="optional"
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-workspace"
 OPENGL_REQUIRED="optional"
 inherit kde4-meta
 

diff --git a/kde-base/systemsettings/systemsettings-9999.ebuild b/kde-base/systemsettings/systemsettings-9999.ebuild
index 54487b4..06b5b40 100644
--- a/kde-base/systemsettings/systemsettings-9999.ebuild
+++ b/kde-base/systemsettings/systemsettings-9999.ebuild
@@ -5,8 +5,7 @@
 EAPI=3
 
 KDE_HANDBOOK="optional"
-KDE_SCM="git"
-KMNAME="kde-workspace"
+KMNAME="kdebase-workspace"
 OPENGL_REQUIRED="optional"
 inherit kde4-meta
 



^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-base/kwalletd/, kde-base/kreadconfig/, kde-base/libplasmagenericshell/, ...
@ 2011-05-24  9:35 Tomas Chvatal
  0 siblings, 0 replies; 2+ messages in thread
From: Tomas Chvatal @ 2011-05-24  9:35 UTC (permalink / raw
  To: gentoo-commits

commit:     bf4e5673f5b41cee985c4ac33e03f278d82a5908
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Tue May 24 09:35:15 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Tue May 24 09:35:15 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=bf4e5673

Use unquoted eapi everywhere.

---
 .../activitymanager/activitymanager-4.6.80.ebuild  |    2 +-
 kde-base/attica/attica-4.6.80.ebuild               |    2 +-
 kde-base/dolphin/dolphin-4.6.80.ebuild             |    2 +-
 kde-base/drkonqi/drkonqi-4.6.80.ebuild             |    2 +-
 .../freespacenotifier-4.6.80.ebuild                |    2 +-
 kde-base/kcheckpass/kcheckpass-4.6.80.ebuild       |    2 +-
 kde-base/kcminit/kcminit-4.6.80.ebuild             |    2 +-
 kde-base/kcmshell/kcmshell-4.6.80.ebuild           |    2 +-
 kde-base/kcontrol/kcontrol-4.6.80.ebuild           |    2 +-
 kde-base/kde-env/kde-env-4.6.80.ebuild             |    2 +-
 .../kdebase-cursors/kdebase-cursors-4.6.80.ebuild  |    2 +-
 .../kdebase-desktoptheme-4.6.80.ebuild             |    2 +-
 .../kdebase-kioslaves-4.6.80.ebuild                |    2 +-
 .../kdebase-menu-icons-4.6.80.ebuild               |    2 +-
 kde-base/kdebase-menu/kdebase-menu-4.6.80.ebuild   |    2 +-
 kde-base/kdebugdialog/kdebugdialog-4.6.80.ebuild   |    2 +-
 kde-base/kdelibs/kdelibs-4.6.80.ebuild             |    2 +-
 kde-base/kdepasswd/kdepasswd-4.6.80.ebuild         |    2 +-
 kde-base/kdepimlibs/kdepimlibs-4.6.80.ebuild       |    2 +-
 kde-base/kdesu/kdesu-4.6.80.ebuild                 |    2 +-
 kde-base/kdialog/kdialog-4.6.80.ebuild             |    2 +-
 kde-base/kdm/kdm-4.6.80.ebuild                     |    2 +-
 kde-base/kdnssd/kdnssd-4.6.80.ebuild               |    2 +-
 .../keditbookmarks/keditbookmarks-4.6.80.ebuild    |    2 +-
 kde-base/keditfiletype/keditfiletype-4.6.80.ebuild |    2 +-
 kde-base/kephal/kephal-4.6.80.ebuild               |    2 +-
 kde-base/kfile/kfile-4.6.80.ebuild                 |    2 +-
 kde-base/kfind/kfind-4.6.80.ebuild                 |    2 +-
 kde-base/kfmclient/kfmclient-4.6.80.ebuild         |    2 +-
 kde-base/kglobalaccel/kglobalaccel-4.6.80.ebuild   |    2 +-
 kde-base/khotkeys/khotkeys-4.6.80.ebuild           |    2 +-
 kde-base/kiconfinder/kiconfinder-4.6.80.ebuild     |    2 +-
 kde-base/kinfocenter/kinfocenter-4.6.80.ebuild     |    2 +-
 kde-base/kioclient/kioclient-4.6.80.ebuild         |    2 +-
 kde-base/klipper/klipper-4.6.80.ebuild             |    2 +-
 kde-base/kmenuedit/kmenuedit-4.6.80.ebuild         |    2 +-
 .../kmimetypefinder/kmimetypefinder-4.6.80.ebuild  |    2 +-
 kde-base/knetattach/knetattach-4.6.80.ebuild       |    2 +-
 kde-base/knewstuff/knewstuff-4.6.80.ebuild         |    2 +-
 kde-base/knotify/knotify-4.6.80.ebuild             |    2 +-
 kde-base/konqueror/konqueror-4.6.80.ebuild         |    2 +-
 kde-base/kpasswdserver/kpasswdserver-4.6.80.ebuild |    2 +-
 kde-base/kquitapp/kquitapp-4.6.80.ebuild           |    2 +-
 kde-base/kreadconfig/kreadconfig-4.6.80.ebuild     |    2 +-
 kde-base/krunner/krunner-4.6.80.ebuild             |    2 +-
 kde-base/kscreensaver/kscreensaver-4.6.80.ebuild   |    2 +-
 kde-base/ksmserver/ksmserver-4.6.80.ebuild         |    2 +-
 kde-base/ksplash/ksplash-4.6.80.ebuild             |    2 +-
 kde-base/kstart/kstart-4.6.80.ebuild               |    2 +-
 .../kstartupconfig/kstartupconfig-4.6.80.ebuild    |    2 +-
 kde-base/kstyles/kstyles-4.6.80.ebuild             |    2 +-
 kde-base/ksysguard/ksysguard-4.6.80.ebuild         |    2 +-
 kde-base/ksystraycmd/ksystraycmd-4.6.80.ebuild     |    2 +-
 kde-base/ktimezoned/ktimezoned-4.6.80.ebuild       |    2 +-
 kde-base/ktraderclient/ktraderclient-4.6.80.ebuild |    2 +-
 kde-base/kuiserver/kuiserver-4.6.80.ebuild         |    2 +-
 .../kurifilter-plugins-4.6.80.ebuild               |    2 +-
 kde-base/kwallet/kwallet-4.6.80.ebuild             |    2 +-
 kde-base/kwalletd/kwalletd-4.6.80.ebuild           |    2 +-
 kde-base/kwrite/kwrite-4.6.80.ebuild               |    2 +-
 kde-base/libkonq/libkonq-4.6.80.ebuild             |    2 +-
 kde-base/libkworkspace/libkworkspace-4.6.80.ebuild |    2 +-
 .../liboxygenstyle/liboxygenstyle-4.6.80.ebuild    |    2 +-
 .../libplasmaclock/libplasmaclock-4.6.80.ebuild    |    2 +-
 .../libplasmagenericshell-4.6.80.ebuild            |    2 +-
 .../libtaskmanager/libtaskmanager-4.6.80.ebuild    |    2 +-
 kde-base/nepomuk/nepomuk-4.6.80.ebuild             |    2 +-
 kde-base/nsplugins/nsplugins-4.6.80.ebuild         |    2 +-
 kde-base/oxygen-icons/oxygen-icons-4.6.80.ebuild   |    2 +-
 kde-base/phonon-kde/phonon-kde-4.6.80.ebuild       |    2 +-
 kde-base/plasma-apps/plasma-apps-4.6.80.ebuild     |    2 +-
 .../plasma-runtime/plasma-runtime-4.6.80.ebuild    |    2 +-
 .../renamedlg-plugins-4.6.80.ebuild                |    2 +-
 kde-base/solid-runtime/solid-runtime-4.6.80.ebuild |    2 +-
 kde-base/solid/solid-4.6.80.ebuild                 |    2 +-
 .../systemsettings/systemsettings-4.6.80.ebuild    |    2 +-
 76 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/kde-base/activitymanager/activitymanager-4.6.80.ebuild b/kde-base/activitymanager/activitymanager-4.6.80.ebuild
index 4091aae..284eff9 100644
--- a/kde-base/activitymanager/activitymanager-4.6.80.ebuild
+++ b/kde-base/activitymanager/activitymanager-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-runtime"
 inherit kde4-meta

diff --git a/kde-base/attica/attica-4.6.80.ebuild b/kde-base/attica/attica-4.6.80.ebuild
index 759bee5..0af093d 100644
--- a/kde-base/attica/attica-4.6.80.ebuild
+++ b/kde-base/attica/attica-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-runtime"
 inherit kde4-meta

diff --git a/kde-base/dolphin/dolphin-4.6.80.ebuild b/kde-base/dolphin/dolphin-4.6.80.ebuild
index 53ca0ab..c7d2b83 100644
--- a/kde-base/dolphin/dolphin-4.6.80.ebuild
+++ b/kde-base/dolphin/dolphin-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-baseapps"

diff --git a/kde-base/drkonqi/drkonqi-4.6.80.ebuild b/kde-base/drkonqi/drkonqi-4.6.80.ebuild
index d3526e0..9751d00 100644
--- a/kde-base/drkonqi/drkonqi-4.6.80.ebuild
+++ b/kde-base/drkonqi/drkonqi-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-runtime"
 inherit kde4-meta

diff --git a/kde-base/freespacenotifier/freespacenotifier-4.6.80.ebuild b/kde-base/freespacenotifier/freespacenotifier-4.6.80.ebuild
index 82308ae..e867c3e 100644
--- a/kde-base/freespacenotifier/freespacenotifier-4.6.80.ebuild
+++ b/kde-base/freespacenotifier/freespacenotifier-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-workspace"
 inherit kde4-meta

diff --git a/kde-base/kcheckpass/kcheckpass-4.6.80.ebuild b/kde-base/kcheckpass/kcheckpass-4.6.80.ebuild
index 41bf224..551f41f 100644
--- a/kde-base/kcheckpass/kcheckpass-4.6.80.ebuild
+++ b/kde-base/kcheckpass/kcheckpass-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-workspace"
 inherit kde4-meta

diff --git a/kde-base/kcminit/kcminit-4.6.80.ebuild b/kde-base/kcminit/kcminit-4.6.80.ebuild
index 3fb4ec8..6bcdd4e 100644
--- a/kde-base/kcminit/kcminit-4.6.80.ebuild
+++ b/kde-base/kcminit/kcminit-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-workspace"
 inherit kde4-meta

diff --git a/kde-base/kcmshell/kcmshell-4.6.80.ebuild b/kde-base/kcmshell/kcmshell-4.6.80.ebuild
index 2b34d0a..4e321d7 100644
--- a/kde-base/kcmshell/kcmshell-4.6.80.ebuild
+++ b/kde-base/kcmshell/kcmshell-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-runtime"
 inherit kde4-meta

diff --git a/kde-base/kcontrol/kcontrol-4.6.80.ebuild b/kde-base/kcontrol/kcontrol-4.6.80.ebuild
index 5309284..5a13855 100644
--- a/kde-base/kcontrol/kcontrol-4.6.80.ebuild
+++ b/kde-base/kcontrol/kcontrol-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-runtime"

diff --git a/kde-base/kde-env/kde-env-4.6.80.ebuild b/kde-base/kde-env/kde-env-4.6.80.ebuild
index eafc7b0..3b6d4ff 100644
--- a/kde-base/kde-env/kde-env-4.6.80.ebuild
+++ b/kde-base/kde-env/kde-env-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 CMAKE_REQUIRED="never"
 KDE_REQUIRED="never"

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 9804eea..3cc57d9 100644
--- a/kde-base/kdebase-cursors/kdebase-cursors-4.6.80.ebuild
+++ b/kde-base/kdebase-cursors/kdebase-cursors-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-workspace"
 KMEXTRA="cursors"

diff --git a/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.6.80.ebuild b/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.6.80.ebuild
index ec008ad..d5e6a07 100644
--- a/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.6.80.ebuild
+++ b/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-runtime"
 KMMODULE="desktoptheme"

diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.6.80.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.6.80.ebuild
index 7fab092..2c43f64 100644
--- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.6.80.ebuild
+++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-runtime"

diff --git a/kde-base/kdebase-menu-icons/kdebase-menu-icons-4.6.80.ebuild b/kde-base/kdebase-menu-icons/kdebase-menu-icons-4.6.80.ebuild
index 6ff7c18..66b5194 100644
--- a/kde-base/kdebase-menu-icons/kdebase-menu-icons-4.6.80.ebuild
+++ b/kde-base/kdebase-menu-icons/kdebase-menu-icons-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-runtime"
 KMMODULE="menu"

diff --git a/kde-base/kdebase-menu/kdebase-menu-4.6.80.ebuild b/kde-base/kdebase-menu/kdebase-menu-4.6.80.ebuild
index babdebb..5183b0c 100644
--- a/kde-base/kdebase-menu/kdebase-menu-4.6.80.ebuild
+++ b/kde-base/kdebase-menu/kdebase-menu-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-runtime"
 KMMODULE="kde-menu"

diff --git a/kde-base/kdebugdialog/kdebugdialog-4.6.80.ebuild b/kde-base/kdebugdialog/kdebugdialog-4.6.80.ebuild
index ef428f5..736317d 100644
--- a/kde-base/kdebugdialog/kdebugdialog-4.6.80.ebuild
+++ b/kde-base/kdebugdialog/kdebugdialog-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-runtime"

diff --git a/kde-base/kdelibs/kdelibs-4.6.80.ebuild b/kde-base/kdelibs/kdelibs-4.6.80.ebuild
index a954daa..1cb3bae 100644
--- a/kde-base/kdelibs/kdelibs-4.6.80.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.6.2-r2.ebuild,v 1.2 2011/04/11 21:59:37 dilfridge Exp $
 
-EAPI="4"
+EAPI=4
 
 CPPUNIT_REQUIRED="optional"
 DECLARATIVE_REQUIRED="always"

diff --git a/kde-base/kdepasswd/kdepasswd-4.6.80.ebuild b/kde-base/kdepasswd/kdepasswd-4.6.80.ebuild
index 302af3e..f957ab6 100644
--- a/kde-base/kdepasswd/kdepasswd-4.6.80.ebuild
+++ b/kde-base/kdepasswd/kdepasswd-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-baseapps"

diff --git a/kde-base/kdepimlibs/kdepimlibs-4.6.80.ebuild b/kde-base/kdepimlibs/kdepimlibs-4.6.80.ebuild
index cf9b2fa..a1413bd 100644
--- a/kde-base/kdepimlibs/kdepimlibs-4.6.80.ebuild
+++ b/kde-base/kdepimlibs/kdepimlibs-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KDE_HANDBOOK="optional"
 CPPUNIT_REQUIRED="optional"

diff --git a/kde-base/kdesu/kdesu-4.6.80.ebuild b/kde-base/kdesu/kdesu-4.6.80.ebuild
index 4e25e78..681bc95 100644
--- a/kde-base/kdesu/kdesu-4.6.80.ebuild
+++ b/kde-base/kdesu/kdesu-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-runtime"

diff --git a/kde-base/kdialog/kdialog-4.6.80.ebuild b/kde-base/kdialog/kdialog-4.6.80.ebuild
index 451ff3b..a7e8bb8 100644
--- a/kde-base/kdialog/kdialog-4.6.80.ebuild
+++ b/kde-base/kdialog/kdialog-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-baseapps"
 inherit kde4-meta

diff --git a/kde-base/kdm/kdm-4.6.80.ebuild b/kde-base/kdm/kdm-4.6.80.ebuild
index 210f6fd..21cc2ef 100644
--- a/kde-base/kdm/kdm-4.6.80.ebuild
+++ b/kde-base/kdm/kdm-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-workspace"

diff --git a/kde-base/kdnssd/kdnssd-4.6.80.ebuild b/kde-base/kdnssd/kdnssd-4.6.80.ebuild
index c3b1b88..075c210 100644
--- a/kde-base/kdnssd/kdnssd-4.6.80.ebuild
+++ b/kde-base/kdnssd/kdnssd-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kdenetwork"
 inherit kde4-meta

diff --git a/kde-base/keditbookmarks/keditbookmarks-4.6.80.ebuild b/kde-base/keditbookmarks/keditbookmarks-4.6.80.ebuild
index 09cf9ac..e4a3ca4 100644
--- a/kde-base/keditbookmarks/keditbookmarks-4.6.80.ebuild
+++ b/kde-base/keditbookmarks/keditbookmarks-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-baseapps"
 inherit kde4-meta

diff --git a/kde-base/keditfiletype/keditfiletype-4.6.80.ebuild b/kde-base/keditfiletype/keditfiletype-4.6.80.ebuild
index dd3760e..b608ac5 100644
--- a/kde-base/keditfiletype/keditfiletype-4.6.80.ebuild
+++ b/kde-base/keditfiletype/keditfiletype-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-runtime"
 inherit kde4-meta

diff --git a/kde-base/kephal/kephal-4.6.80.ebuild b/kde-base/kephal/kephal-4.6.80.ebuild
index b19781d..735207c 100644
--- a/kde-base/kephal/kephal-4.6.80.ebuild
+++ b/kde-base/kephal/kephal-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-workspace"
 KMMODULE="libs/kephal"

diff --git a/kde-base/kfile/kfile-4.6.80.ebuild b/kde-base/kfile/kfile-4.6.80.ebuild
index 7009076..a36a068 100644
--- a/kde-base/kfile/kfile-4.6.80.ebuild
+++ b/kde-base/kfile/kfile-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-runtime"
 inherit kde4-meta

diff --git a/kde-base/kfind/kfind-4.6.80.ebuild b/kde-base/kfind/kfind-4.6.80.ebuild
index e4db14f..d354f3e 100644
--- a/kde-base/kfind/kfind-4.6.80.ebuild
+++ b/kde-base/kfind/kfind-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-baseapps"

diff --git a/kde-base/kfmclient/kfmclient-4.6.80.ebuild b/kde-base/kfmclient/kfmclient-4.6.80.ebuild
index 09ac3df..edb9f32 100644
--- a/kde-base/kfmclient/kfmclient-4.6.80.ebuild
+++ b/kde-base/kfmclient/kfmclient-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-baseapps"
 KMMODULE="konqueror/client"

diff --git a/kde-base/kglobalaccel/kglobalaccel-4.6.80.ebuild b/kde-base/kglobalaccel/kglobalaccel-4.6.80.ebuild
index aef0a25..023f9f0 100644
--- a/kde-base/kglobalaccel/kglobalaccel-4.6.80.ebuild
+++ b/kde-base/kglobalaccel/kglobalaccel-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-runtime"
 inherit kde4-meta

diff --git a/kde-base/khotkeys/khotkeys-4.6.80.ebuild b/kde-base/khotkeys/khotkeys-4.6.80.ebuild
index 70fb89a..b8c5c3d 100644
--- a/kde-base/khotkeys/khotkeys-4.6.80.ebuild
+++ b/kde-base/khotkeys/khotkeys-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-workspace"
 inherit kde4-meta

diff --git a/kde-base/kiconfinder/kiconfinder-4.6.80.ebuild b/kde-base/kiconfinder/kiconfinder-4.6.80.ebuild
index 042cc7e..53a81fe 100644
--- a/kde-base/kiconfinder/kiconfinder-4.6.80.ebuild
+++ b/kde-base/kiconfinder/kiconfinder-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-runtime"
 inherit kde4-meta

diff --git a/kde-base/kinfocenter/kinfocenter-4.6.80.ebuild b/kde-base/kinfocenter/kinfocenter-4.6.80.ebuild
index cbf425d..c5e1509 100644
--- a/kde-base/kinfocenter/kinfocenter-4.6.80.ebuild
+++ b/kde-base/kinfocenter/kinfocenter-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-workspace"

diff --git a/kde-base/kioclient/kioclient-4.6.80.ebuild b/kde-base/kioclient/kioclient-4.6.80.ebuild
index dcf188f..8e470b6 100644
--- a/kde-base/kioclient/kioclient-4.6.80.ebuild
+++ b/kde-base/kioclient/kioclient-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-runtime"
 inherit kde4-meta

diff --git a/kde-base/klipper/klipper-4.6.80.ebuild b/kde-base/klipper/klipper-4.6.80.ebuild
index c993f61..cd3f5b8 100644
--- a/kde-base/klipper/klipper-4.6.80.ebuild
+++ b/kde-base/klipper/klipper-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-workspace"

diff --git a/kde-base/kmenuedit/kmenuedit-4.6.80.ebuild b/kde-base/kmenuedit/kmenuedit-4.6.80.ebuild
index f7f065c..c19a9a8 100644
--- a/kde-base/kmenuedit/kmenuedit-4.6.80.ebuild
+++ b/kde-base/kmenuedit/kmenuedit-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-workspace"

diff --git a/kde-base/kmimetypefinder/kmimetypefinder-4.6.80.ebuild b/kde-base/kmimetypefinder/kmimetypefinder-4.6.80.ebuild
index 4774e4a..f8fc853 100644
--- a/kde-base/kmimetypefinder/kmimetypefinder-4.6.80.ebuild
+++ b/kde-base/kmimetypefinder/kmimetypefinder-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-runtime"
 inherit kde4-meta

diff --git a/kde-base/knetattach/knetattach-4.6.80.ebuild b/kde-base/knetattach/knetattach-4.6.80.ebuild
index eeed91e..5b9c65e 100644
--- a/kde-base/knetattach/knetattach-4.6.80.ebuild
+++ b/kde-base/knetattach/knetattach-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-runtime"

diff --git a/kde-base/knewstuff/knewstuff-4.6.80.ebuild b/kde-base/knewstuff/knewstuff-4.6.80.ebuild
index 366b24f..7c6064c 100644
--- a/kde-base/knewstuff/knewstuff-4.6.80.ebuild
+++ b/kde-base/knewstuff/knewstuff-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-runtime"
 inherit kde4-meta

diff --git a/kde-base/knotify/knotify-4.6.80.ebuild b/kde-base/knotify/knotify-4.6.80.ebuild
index 0ea636b..12794be 100644
--- a/kde-base/knotify/knotify-4.6.80.ebuild
+++ b/kde-base/knotify/knotify-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-runtime"
 inherit kde4-meta

diff --git a/kde-base/konqueror/konqueror-4.6.80.ebuild b/kde-base/konqueror/konqueror-4.6.80.ebuild
index 75a1de2..140a254 100644
--- a/kde-base/konqueror/konqueror-4.6.80.ebuild
+++ b/kde-base/konqueror/konqueror-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-baseapps"

diff --git a/kde-base/kpasswdserver/kpasswdserver-4.6.80.ebuild b/kde-base/kpasswdserver/kpasswdserver-4.6.80.ebuild
index b5ce3d7..8627194 100644
--- a/kde-base/kpasswdserver/kpasswdserver-4.6.80.ebuild
+++ b/kde-base/kpasswdserver/kpasswdserver-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-runtime"
 inherit kde4-meta

diff --git a/kde-base/kquitapp/kquitapp-4.6.80.ebuild b/kde-base/kquitapp/kquitapp-4.6.80.ebuild
index 96b9a4d..0b050b4 100644
--- a/kde-base/kquitapp/kquitapp-4.6.80.ebuild
+++ b/kde-base/kquitapp/kquitapp-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-runtime"
 inherit kde4-meta

diff --git a/kde-base/kreadconfig/kreadconfig-4.6.80.ebuild b/kde-base/kreadconfig/kreadconfig-4.6.80.ebuild
index bf026e5..47f4f4d 100644
--- a/kde-base/kreadconfig/kreadconfig-4.6.80.ebuild
+++ b/kde-base/kreadconfig/kreadconfig-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-runtime"
 inherit kde4-meta

diff --git a/kde-base/krunner/krunner-4.6.80.ebuild b/kde-base/krunner/krunner-4.6.80.ebuild
index 2d1cd18..6d77d5d 100644
--- a/kde-base/krunner/krunner-4.6.80.ebuild
+++ b/kde-base/krunner/krunner-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-workspace"
 OPENGL_REQUIRED="optional"

diff --git a/kde-base/kscreensaver/kscreensaver-4.6.80.ebuild b/kde-base/kscreensaver/kscreensaver-4.6.80.ebuild
index 8a950f1..0bdf698 100644
--- a/kde-base/kscreensaver/kscreensaver-4.6.80.ebuild
+++ b/kde-base/kscreensaver/kscreensaver-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-workspace"
 OPENGL_REQUIRED="optional"

diff --git a/kde-base/ksmserver/ksmserver-4.6.80.ebuild b/kde-base/ksmserver/ksmserver-4.6.80.ebuild
index fdccfdd..50819d7 100644
--- a/kde-base/ksmserver/ksmserver-4.6.80.ebuild
+++ b/kde-base/ksmserver/ksmserver-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-workspace"
 inherit kde4-meta

diff --git a/kde-base/ksplash/ksplash-4.6.80.ebuild b/kde-base/ksplash/ksplash-4.6.80.ebuild
index 8d283df..1a51f3d 100644
--- a/kde-base/ksplash/ksplash-4.6.80.ebuild
+++ b/kde-base/ksplash/ksplash-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-workspace"
 inherit kde4-meta

diff --git a/kde-base/kstart/kstart-4.6.80.ebuild b/kde-base/kstart/kstart-4.6.80.ebuild
index 8699803..ff99052 100644
--- a/kde-base/kstart/kstart-4.6.80.ebuild
+++ b/kde-base/kstart/kstart-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-runtime"
 inherit kde4-meta

diff --git a/kde-base/kstartupconfig/kstartupconfig-4.6.80.ebuild b/kde-base/kstartupconfig/kstartupconfig-4.6.80.ebuild
index 1ec55f6..15f1013 100644
--- a/kde-base/kstartupconfig/kstartupconfig-4.6.80.ebuild
+++ b/kde-base/kstartupconfig/kstartupconfig-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-workspace"
 inherit kde4-meta

diff --git a/kde-base/kstyles/kstyles-4.6.80.ebuild b/kde-base/kstyles/kstyles-4.6.80.ebuild
index 2bfd7c0..3be649d 100644
--- a/kde-base/kstyles/kstyles-4.6.80.ebuild
+++ b/kde-base/kstyles/kstyles-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-workspace"
 inherit kde4-meta

diff --git a/kde-base/ksysguard/ksysguard-4.6.80.ebuild b/kde-base/ksysguard/ksysguard-4.6.80.ebuild
index 1987573..07f3859 100644
--- a/kde-base/ksysguard/ksysguard-4.6.80.ebuild
+++ b/kde-base/ksysguard/ksysguard-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-workspace"

diff --git a/kde-base/ksystraycmd/ksystraycmd-4.6.80.ebuild b/kde-base/ksystraycmd/ksystraycmd-4.6.80.ebuild
index 8886014..f42664f 100644
--- a/kde-base/ksystraycmd/ksystraycmd-4.6.80.ebuild
+++ b/kde-base/ksystraycmd/ksystraycmd-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-workspace"
 inherit kde4-meta

diff --git a/kde-base/ktimezoned/ktimezoned-4.6.80.ebuild b/kde-base/ktimezoned/ktimezoned-4.6.80.ebuild
index 679e650..871d461 100644
--- a/kde-base/ktimezoned/ktimezoned-4.6.80.ebuild
+++ b/kde-base/ktimezoned/ktimezoned-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-runtime"
 inherit kde4-meta

diff --git a/kde-base/ktraderclient/ktraderclient-4.6.80.ebuild b/kde-base/ktraderclient/ktraderclient-4.6.80.ebuild
index ec85157..9d21099 100644
--- a/kde-base/ktraderclient/ktraderclient-4.6.80.ebuild
+++ b/kde-base/ktraderclient/ktraderclient-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-runtime"
 inherit kde4-meta

diff --git a/kde-base/kuiserver/kuiserver-4.6.80.ebuild b/kde-base/kuiserver/kuiserver-4.6.80.ebuild
index a07c0ee..89e1f60 100644
--- a/kde-base/kuiserver/kuiserver-4.6.80.ebuild
+++ b/kde-base/kuiserver/kuiserver-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-runtime"
 inherit kde4-meta

diff --git a/kde-base/kurifilter-plugins/kurifilter-plugins-4.6.80.ebuild b/kde-base/kurifilter-plugins/kurifilter-plugins-4.6.80.ebuild
index a6a61e0..8941255 100644
--- a/kde-base/kurifilter-plugins/kurifilter-plugins-4.6.80.ebuild
+++ b/kde-base/kurifilter-plugins/kurifilter-plugins-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-runtime"
 inherit kde4-meta

diff --git a/kde-base/kwallet/kwallet-4.6.80.ebuild b/kde-base/kwallet/kwallet-4.6.80.ebuild
index be8f09f..958f154 100644
--- a/kde-base/kwallet/kwallet-4.6.80.ebuild
+++ b/kde-base/kwallet/kwallet-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KDE_HANDBOOK="optional"
 KMNAME="kdeutils"

diff --git a/kde-base/kwalletd/kwalletd-4.6.80.ebuild b/kde-base/kwalletd/kwalletd-4.6.80.ebuild
index 7169802..2e7fd23 100644
--- a/kde-base/kwalletd/kwalletd-4.6.80.ebuild
+++ b/kde-base/kwalletd/kwalletd-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-runtime"
 inherit kde4-meta

diff --git a/kde-base/kwrite/kwrite-4.6.80.ebuild b/kde-base/kwrite/kwrite-4.6.80.ebuild
index 2d809d7..a06de86 100644
--- a/kde-base/kwrite/kwrite-4.6.80.ebuild
+++ b/kde-base/kwrite/kwrite-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KDE_HANDBOOK="optional"
 KMNAME="kate"

diff --git a/kde-base/libkonq/libkonq-4.6.80.ebuild b/kde-base/libkonq/libkonq-4.6.80.ebuild
index 47c628d..efa001b 100644
--- a/kde-base/libkonq/libkonq-4.6.80.ebuild
+++ b/kde-base/libkonq/libkonq-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-baseapps"
 KMMODULE="lib/konq"

diff --git a/kde-base/libkworkspace/libkworkspace-4.6.80.ebuild b/kde-base/libkworkspace/libkworkspace-4.6.80.ebuild
index 3b739a7..bde64f2 100644
--- a/kde-base/libkworkspace/libkworkspace-4.6.80.ebuild
+++ b/kde-base/libkworkspace/libkworkspace-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-workspace"
 KMMODULE="libs/kworkspace"

diff --git a/kde-base/liboxygenstyle/liboxygenstyle-4.6.80.ebuild b/kde-base/liboxygenstyle/liboxygenstyle-4.6.80.ebuild
index 9a62469..3b0609f 100644
--- a/kde-base/liboxygenstyle/liboxygenstyle-4.6.80.ebuild
+++ b/kde-base/liboxygenstyle/liboxygenstyle-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-workspace"
 KMMODULE="libs/oxygen"

diff --git a/kde-base/libplasmaclock/libplasmaclock-4.6.80.ebuild b/kde-base/libplasmaclock/libplasmaclock-4.6.80.ebuild
index 4248dce..4faf972 100644
--- a/kde-base/libplasmaclock/libplasmaclock-4.6.80.ebuild
+++ b/kde-base/libplasmaclock/libplasmaclock-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-workspace"
 KMMODULE="libs/plasmaclock"

diff --git a/kde-base/libplasmagenericshell/libplasmagenericshell-4.6.80.ebuild b/kde-base/libplasmagenericshell/libplasmagenericshell-4.6.80.ebuild
index bcacfa2..92955e7 100644
--- a/kde-base/libplasmagenericshell/libplasmagenericshell-4.6.80.ebuild
+++ b/kde-base/libplasmagenericshell/libplasmagenericshell-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-workspace"
 KMMODULE="libs/plasmagenericshell"

diff --git a/kde-base/libtaskmanager/libtaskmanager-4.6.80.ebuild b/kde-base/libtaskmanager/libtaskmanager-4.6.80.ebuild
index 2ed5031..d68af8a 100644
--- a/kde-base/libtaskmanager/libtaskmanager-4.6.80.ebuild
+++ b/kde-base/libtaskmanager/libtaskmanager-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-workspace"
 KMMODULE="libs/taskmanager"

diff --git a/kde-base/nepomuk/nepomuk-4.6.80.ebuild b/kde-base/nepomuk/nepomuk-4.6.80.ebuild
index bfb3f20..11cca3a 100644
--- a/kde-base/nepomuk/nepomuk-4.6.80.ebuild
+++ b/kde-base/nepomuk/nepomuk-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-runtime"

diff --git a/kde-base/nsplugins/nsplugins-4.6.80.ebuild b/kde-base/nsplugins/nsplugins-4.6.80.ebuild
index ac12006..d2a4651 100644
--- a/kde-base/nsplugins/nsplugins-4.6.80.ebuild
+++ b/kde-base/nsplugins/nsplugins-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-baseapps"
 inherit kde4-meta

diff --git a/kde-base/oxygen-icons/oxygen-icons-4.6.80.ebuild b/kde-base/oxygen-icons/oxygen-icons-4.6.80.ebuild
index 0a5a551..6d36704 100644
--- a/kde-base/oxygen-icons/oxygen-icons-4.6.80.ebuild
+++ b/kde-base/oxygen-icons/oxygen-icons-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 if [[ ${PV} == *9999 ]]; then
 	KMNAME="kdesupport"

diff --git a/kde-base/phonon-kde/phonon-kde-4.6.80.ebuild b/kde-base/phonon-kde/phonon-kde-4.6.80.ebuild
index 9bd9e34..da1bc67 100644
--- a/kde-base/phonon-kde/phonon-kde-4.6.80.ebuild
+++ b/kde-base/phonon-kde/phonon-kde-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-runtime"
 KMMODULE="phonon"

diff --git a/kde-base/plasma-apps/plasma-apps-4.6.80.ebuild b/kde-base/plasma-apps/plasma-apps-4.6.80.ebuild
index 86da515..0e49c0f 100644
--- a/kde-base/plasma-apps/plasma-apps-4.6.80.ebuild
+++ b/kde-base/plasma-apps/plasma-apps-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-baseapps"
 KMMODULE="plasma"

diff --git a/kde-base/plasma-runtime/plasma-runtime-4.6.80.ebuild b/kde-base/plasma-runtime/plasma-runtime-4.6.80.ebuild
index 9e534de..4ce2fc0 100644
--- a/kde-base/plasma-runtime/plasma-runtime-4.6.80.ebuild
+++ b/kde-base/plasma-runtime/plasma-runtime-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-runtime"
 KMMODULE="plasma"

diff --git a/kde-base/renamedlg-plugins/renamedlg-plugins-4.6.80.ebuild b/kde-base/renamedlg-plugins/renamedlg-plugins-4.6.80.ebuild
index 99cd9bd..1b8c765 100644
--- a/kde-base/renamedlg-plugins/renamedlg-plugins-4.6.80.ebuild
+++ b/kde-base/renamedlg-plugins/renamedlg-plugins-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-runtime"
 KMMODULE="renamedlgplugins"

diff --git a/kde-base/solid-runtime/solid-runtime-4.6.80.ebuild b/kde-base/solid-runtime/solid-runtime-4.6.80.ebuild
index bd3bf8a..0a8e24d 100644
--- a/kde-base/solid-runtime/solid-runtime-4.6.80.ebuild
+++ b/kde-base/solid-runtime/solid-runtime-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-runtime"
 KMNOMODULE=true

diff --git a/kde-base/solid/solid-4.6.80.ebuild b/kde-base/solid/solid-4.6.80.ebuild
index 81c4db5..03eca6a 100644
--- a/kde-base/solid/solid-4.6.80.ebuild
+++ b/kde-base/solid/solid-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/kde-base/solid/solid-4.6.0.ebuild,v 1.2 2011/02/02 11:25:09 scarabeus Exp $
 
-EAPI="4"
+EAPI=4
 
 KMNAME="kde-workspace"
 CPPUNIT_REQUIRED="test"

diff --git a/kde-base/systemsettings/systemsettings-4.6.80.ebuild b/kde-base/systemsettings/systemsettings-4.6.80.ebuild
index 7cd5aae..7f4e28b 100644
--- a/kde-base/systemsettings/systemsettings-4.6.80.ebuild
+++ b/kde-base/systemsettings/systemsettings-4.6.80.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-workspace"



^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2011-05-24  9:35 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-24  9:35 [gentoo-commits] proj/kde:master commit in: kde-base/kwalletd/, kde-base/kreadconfig/, kde-base/libplasmagenericshell/, Tomas Chvatal
  -- strict thread matches above, loose matches on Subject: below --
2011-02-10 17:55 Maciej Mrozowski

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox