Revert my last three commits

This reverts commits: 7cad498, b1dc4d1 and 70b93e6.
wired · Feb 10, 2011 · 34e8c52 · 34e8c52
1 parent ff14665
commit 34e8c52
Show file tree

Hide file tree

Showing 208 changed files with 288 additions and 429 deletions.
diff --git 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/Manifest b/kde-base/activitymanager/Manifest
@@ -1,3 +1,3 @@
-EBUILD activitymanager-4.6.9999.ebuild 239 RMD160 915a9033df319043e83f34c39490f01215f32bef SHA1 6331bdec648a46a5b925e21401f571c53c80fce0 SHA256 faf1f3bb995c317e3ff85def519fb4d9ab5fee64123ccb301de764fec22691cd
-EBUILD activitymanager-9999.ebuild 239 RMD160 915a9033df319043e83f34c39490f01215f32bef SHA1 6331bdec648a46a5b925e21401f571c53c80fce0 SHA256 faf1f3bb995c317e3ff85def519fb4d9ab5fee64123ccb301de764fec22691cd
+EBUILD activitymanager-4.6.9999.ebuild 229 RMD160 ce93d6a3a380286ffce4c49af3c25a7b194d50ad SHA1 5b8430602b89504cd0058698fa0106b6ad9245e6 SHA256 58abaa6a9346a42e1ed40fef03f28ec1df9eada483e2f72f54823d402e27d825
+EBUILD activitymanager-9999.ebuild 229 RMD160 ce93d6a3a380286ffce4c49af3c25a7b194d50ad SHA1 5b8430602b89504cd0058698fa0106b6ad9245e6 SHA256 58abaa6a9346a42e1ed40fef03f28ec1df9eada483e2f72f54823d402e27d825
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git 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
@@ -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/Manifest b/kde-base/attica/Manifest
@@ -1,3 +1,3 @@
-EBUILD attica-4.6.9999.ebuild 330 RMD160 d751df5ae0826e9ba88e6cc119c46c64fdb44818 SHA1 d157cc211c54bd252424ca3fac761a6fadad93d4 SHA256 64ff6406bf6f3a586c280182c0027f8cc4ca2c182f59bfb2cc0bd3f0c12bc2c7
-EBUILD attica-9999.ebuild 330 RMD160 d751df5ae0826e9ba88e6cc119c46c64fdb44818 SHA1 d157cc211c54bd252424ca3fac761a6fadad93d4 SHA256 64ff6406bf6f3a586c280182c0027f8cc4ca2c182f59bfb2cc0bd3f0c12bc2c7
+EBUILD attica-4.6.9999.ebuild 320 RMD160 3241900043320c9463a515b07b7b587e4b1bf70f SHA1 c2698d345b79b9ec1841e443a085aae6fbc3afcf SHA256 5d6e3f22dcc3197a15bfb70dcfe55141313ce7d4a0ece7738652d6ebeb805b98
+EBUILD attica-9999.ebuild 320 RMD160 3241900043320c9463a515b07b7b587e4b1bf70f SHA1 c2698d345b79b9ec1841e443a085aae6fbc3afcf SHA256 5d6e3f22dcc3197a15bfb70dcfe55141313ce7d4a0ece7738652d6ebeb805b98
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git 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
@@ -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/Manifest b/kde-base/drkonqi/Manifest
@@ -1,3 +1,3 @@
-EBUILD drkonqi-4.6.9999.ebuild 495 RMD160 f4ba5d924ccb0c885814832c611ac2d9d1f9e4e9 SHA1 1023ed98e7fda62c64d825e69d0aa4b7a241b5c0 SHA256 91118f56e5abd68cbd2ca85796681e3154240eafee77b5080d7d82315a6d6fc1
-EBUILD drkonqi-9999.ebuild 495 RMD160 f4ba5d924ccb0c885814832c611ac2d9d1f9e4e9 SHA1 1023ed98e7fda62c64d825e69d0aa4b7a241b5c0 SHA256 91118f56e5abd68cbd2ca85796681e3154240eafee77b5080d7d82315a6d6fc1
+EBUILD drkonqi-4.6.9999.ebuild 485 RMD160 48a5764d6ad4e943a1354f41ba4ba75f690f00cd SHA1 e74c1b7ae513b5ff5579c6b039da092eb4e0fe89 SHA256 a92429f4a71cc08b2c79f100418a22c23f2223bf590b5749fc9467d2e9a4e6eb
+EBUILD drkonqi-9999.ebuild 485 RMD160 48a5764d6ad4e943a1354f41ba4ba75f690f00cd SHA1 e74c1b7ae513b5ff5579c6b039da092eb4e0fe89 SHA256 a92429f4a71cc08b2c79f100418a22c23f2223bf590b5749fc9467d2e9a4e6eb
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git 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
@@ -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/Manifest b/kde-base/freespacenotifier/Manifest
@@ -1,3 +1,3 @@
-EBUILD freespacenotifier-4.6.9999.ebuild 279 RMD160 0376f51d23ad6eccd79636aa7a71f09efca26188 SHA1 c66abd02e8f99903870c1eba59b800fa4b7e78ac SHA256 a566eef404ff2fecce2cf3b95c1da0687a6ba67d82a9956b3dc1549ce5dccd1d
-EBUILD freespacenotifier-9999.ebuild 279 RMD160 0376f51d23ad6eccd79636aa7a71f09efca26188 SHA1 c66abd02e8f99903870c1eba59b800fa4b7e78ac SHA256 a566eef404ff2fecce2cf3b95c1da0687a6ba67d82a9956b3dc1549ce5dccd1d
+EBUILD freespacenotifier-4.6.9999.ebuild 269 RMD160 6eb620073974d8f5cdaea4af5daea0f8a4bfe296 SHA1 cb2ba2bc58713f309805cfda88cf31178297e67d SHA256 2cf050ad190c668024b456f4a7d5c8da4dc0fa1fce716f8e83f125cab1c704b4
+EBUILD freespacenotifier-9999.ebuild 269 RMD160 6eb620073974d8f5cdaea4af5daea0f8a4bfe296 SHA1 cb2ba2bc58713f309805cfda88cf31178297e67d SHA256 2cf050ad190c668024b456f4a7d5c8da4dc0fa1fce716f8e83f125cab1c704b4
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git 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
@@ -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/Manifest b/kde-base/kcheckpass/Manifest
@@ -1,5 +1,5 @@
 AUX kcheckpass-4.4.2-no-SUID-no-GUID.patch 648 RMD160 e8122c5c2f495bb03852cd649acd357de7e5385a SHA1 f8d301999328a8c2ab8d546fb002cdd2b5fffbb9 SHA256 d685abdd0eab0a6215ab052caa457712cb6e03c82f8877ee277c8c090e57be6d
 AUX kdebase-4.0.2-pam-optional.patch 979 RMD160 abdb7293c02507dfd0a032e72f3e449405b6d8a0 SHA1 33e2f936f0548f9b19fe541c0f71db06f9daaf63 SHA256 efa4e0132687dbaa68ab5c8a5911c4a08b5d4e9eb4d2a04879f765b8e44ba9ea
-EBUILD kcheckpass-4.6.9999.ebuild 658 RMD160 b970a59c4d9bd2cfa7664adc5589b2dc51ec6eec SHA1 ae4381634c941e49e4d55629b2786550ba43cfe2 SHA256 22765050ac44443586ce097bb2af2112ca6eda53aaad85ce7c963bfac0c96f2a
-EBUILD kcheckpass-9999.ebuild 658 RMD160 b970a59c4d9bd2cfa7664adc5589b2dc51ec6eec SHA1 ae4381634c941e49e4d55629b2786550ba43cfe2 SHA256 22765050ac44443586ce097bb2af2112ca6eda53aaad85ce7c963bfac0c96f2a
+EBUILD kcheckpass-4.6.9999.ebuild 648 RMD160 9c6a7d52a223b52f49f350c244624eb94c311a70 SHA1 1df00b852f6e0e974382e7d7d2508f425e2275be SHA256 ce51f785080bcf90c8242d5773d67220025f05d5d6ad59b45abbccde57a35ccd
+EBUILD kcheckpass-9999.ebuild 648 RMD160 9c6a7d52a223b52f49f350c244624eb94c311a70 SHA1 1df00b852f6e0e974382e7d7d2508f425e2275be SHA256 ce51f785080bcf90c8242d5773d67220025f05d5d6ad59b45abbccde57a35ccd
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git 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
@@ -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/Manifest b/kde-base/kcminit/Manifest
@@ -1,3 +1,3 @@
-EBUILD kcminit-4.6.9999.ebuild 344 RMD160 85c2d1f408592b3366a45a33d11a5988e660d1d9 SHA1 487431976b128f7831848ca82340a24b70e79642 SHA256 0b17f69ed88f65c4afe47cebcfc3501ec8b72016030a9fd9cbbf605b80393c9d
-EBUILD kcminit-9999.ebuild 344 RMD160 85c2d1f408592b3366a45a33d11a5988e660d1d9 SHA1 487431976b128f7831848ca82340a24b70e79642 SHA256 0b17f69ed88f65c4afe47cebcfc3501ec8b72016030a9fd9cbbf605b80393c9d
+EBUILD kcminit-4.6.9999.ebuild 334 RMD160 11739476c3c46e5d6b0248702e748d5d92e776d6 SHA1 9e60fee31dd20f7d8fad9d91d93ad901a61fc2f6 SHA256 ac66b5e23736eff283b73cc2827346ec75c9321fb4268222308e536c432d96c2
+EBUILD kcminit-9999.ebuild 334 RMD160 11739476c3c46e5d6b0248702e748d5d92e776d6 SHA1 9e60fee31dd20f7d8fad9d91d93ad901a61fc2f6 SHA256 ac66b5e23736eff283b73cc2827346ec75c9321fb4268222308e536c432d96c2
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git 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
@@ -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/Manifest b/kde-base/kcmshell/Manifest
@@ -1,3 +1,3 @@
-EBUILD kcmshell-4.6.9999.ebuild 305 RMD160 d2b0a9b50f54f4944440c7b7970376a9d7b088ab SHA1 0a826535225ab081e13b7e9f36be8d8a64a0cb39 SHA256 8aa816b8741f7e3d627a7f7ddaaac8fb7b139385bc5748431dd31e5992028b3b
-EBUILD kcmshell-9999.ebuild 305 RMD160 d2b0a9b50f54f4944440c7b7970376a9d7b088ab SHA1 0a826535225ab081e13b7e9f36be8d8a64a0cb39 SHA256 8aa816b8741f7e3d627a7f7ddaaac8fb7b139385bc5748431dd31e5992028b3b
+EBUILD kcmshell-4.6.9999.ebuild 295 RMD160 ea036beffb41c3c9894f50bc7edf7daba7f33526 SHA1 cd671de4114468a931b138b187b0c32a898506cd SHA256 6ce8a19d6ce37958d1c9d7e1276c09aa25e669ca3945be67c8c29d6a7aeea0f4
+EBUILD kcmshell-9999.ebuild 295 RMD160 ea036beffb41c3c9894f50bc7edf7daba7f33526 SHA1 cd671de4114468a931b138b187b0c32a898506cd SHA256 6ce8a19d6ce37958d1c9d7e1276c09aa25e669ca3945be67c8c29d6a7aeea0f4
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git 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
@@ -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/Manifest b/kde-base/kcontrol/Manifest
@@ -1,3 +1,3 @@
-EBUILD kcontrol-4.6.9999.ebuild 376 RMD160 af3aab39d8715bb93b01954497c73abc852b20bd SHA1 ab0e4f7ccab2b5466f475c6ec504d7e8c0a47bc1 SHA256 bce503f1d2a8aeb3f27cb988d92d4c92e2d83b6c65156235c94936337b3c576c
-EBUILD kcontrol-9999.ebuild 376 RMD160 af3aab39d8715bb93b01954497c73abc852b20bd SHA1 ab0e4f7ccab2b5466f475c6ec504d7e8c0a47bc1 SHA256 bce503f1d2a8aeb3f27cb988d92d4c92e2d83b6c65156235c94936337b3c576c
+EBUILD kcontrol-4.6.9999.ebuild 366 RMD160 83a56aef1887b8cc7954fee7efea3c909406116f SHA1 baf60391f568aaf9837f827c578d20bdb29556cf SHA256 b205094f0d64c253faa488e4582458731d7b8c0fe5bc76a101e8e6a078b208c4
+EBUILD kcontrol-9999.ebuild 366 RMD160 83a56aef1887b8cc7954fee7efea3c909406116f SHA1 baf60391f568aaf9837f827c578d20bdb29556cf SHA256 b205094f0d64c253faa488e4582458731d7b8c0fe5bc76a101e8e6a078b208c4
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git 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
@@ -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/Manifest b/kde-base/kdebase-cursors/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdebase-cursors-4.6.9999.ebuild 283 RMD160 e035119846ddcbd85641a2f5640078e272bee852 SHA1 476b68472b3e1df05343355262cec9b979fe2f37 SHA256 c2ed831b03ec3f9582bf84431c30f8cf23e3dc0cdfad4961c269b35c4c00a874
-EBUILD kdebase-cursors-9999.ebuild 283 RMD160 e035119846ddcbd85641a2f5640078e272bee852 SHA1 476b68472b3e1df05343355262cec9b979fe2f37 SHA256 c2ed831b03ec3f9582bf84431c30f8cf23e3dc0cdfad4961c269b35c4c00a874
+EBUILD kdebase-cursors-4.6.9999.ebuild 273 RMD160 d139bb1715714699c0050b3165f9c8b566d2eaaf SHA1 e8efcf3913a94036257bfa80c89ac3a99bc5032c SHA256 1a49f3e8f0e51d2a6a00dd797bf861a9c97f2dc5e895b9d7235d2bb706c700f2
+EBUILD kdebase-cursors-9999.ebuild 273 RMD160 d139bb1715714699c0050b3165f9c8b566d2eaaf SHA1 e8efcf3913a94036257bfa80c89ac3a99bc5032c SHA256 1a49f3e8f0e51d2a6a00dd797bf861a9c97f2dc5e895b9d7235d2bb706c700f2
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git 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
@@ -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/Manifest b/kde-base/kdebase-data/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdebase-data-4.6.9999.ebuild 808 RMD160 dbe7e94812c911afc7f8f3e63e3872aa89891287 SHA1 8867cb9883e33c3bc3071ba265a3a5c15b24b584 SHA256 83916e78ee68ed28343ed87faac240ebcb9482d79b1dbacddf2c2886d6be05ea
-EBUILD kdebase-data-9999.ebuild 808 RMD160 dbe7e94812c911afc7f8f3e63e3872aa89891287 SHA1 8867cb9883e33c3bc3071ba265a3a5c15b24b584 SHA256 83916e78ee68ed28343ed87faac240ebcb9482d79b1dbacddf2c2886d6be05ea
+EBUILD kdebase-data-4.6.9999.ebuild 798 RMD160 4cb58f15d231d63352166dec33d0520754fab5d1 SHA1 06674976b6955436478afcddc8ba39069a7d6b29 SHA256 f107eb149f92aa46a5eec74f0d22db93c563990c2da2296b0315ffc06010f8ad
+EBUILD kdebase-data-9999.ebuild 798 RMD160 4cb58f15d231d63352166dec33d0520754fab5d1 SHA1 06674976b6955436478afcddc8ba39069a7d6b29 SHA256 f107eb149f92aa46a5eec74f0d22db93c563990c2da2296b0315ffc06010f8ad
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git 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
@@ -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/Manifest b/kde-base/kdebase-desktoptheme/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdebase-desktoptheme-4.6.9999.ebuild 268 RMD160 647bd24c30fad1b2404d64d9756157d0df64848a SHA1 90a1910c03725e8863f1d0c4f15d4a79f8a9d665 SHA256 7bb53bcd53fb04b7d6dda87065b4eba449a8b6b6a6227a8b37983a33ebe134a1
-EBUILD kdebase-desktoptheme-9999.ebuild 268 RMD160 647bd24c30fad1b2404d64d9756157d0df64848a SHA1 90a1910c03725e8863f1d0c4f15d4a79f8a9d665 SHA256 7bb53bcd53fb04b7d6dda87065b4eba449a8b6b6a6227a8b37983a33ebe134a1
+EBUILD kdebase-desktoptheme-4.6.9999.ebuild 258 RMD160 415fca2864b6a689a3e0131c902122d91bbf6d1c SHA1 fb6279023cff83e9a3114b30fc392728acaa705d SHA256 2249d4f49f979057e817f10c4dd3414399eb47b4c8b7b0c51a38ca5d6a43b8cf
+EBUILD kdebase-desktoptheme-9999.ebuild 258 RMD160 415fca2864b6a689a3e0131c902122d91bbf6d1c SHA1 fb6279023cff83e9a3114b30fc392728acaa705d SHA256 2249d4f49f979057e817f10c4dd3414399eb47b4c8b7b0c51a38ca5d6a43b8cf
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git 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
@@ -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/Manifest b/kde-base/kdebase-kioslaves/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdebase-kioslaves-4.6.9999.ebuild 1229 RMD160 873109a563d03880bf5105ca343572720cf40963 SHA1 04a8b4c20d3af53365e7dbfbc55ab76474c895f0 SHA256 8047350d6ffaeeb20e92cf0a6dbfccf0cbbd2638794c4fc3f77e159e4884c701
-EBUILD kdebase-kioslaves-9999.ebuild 1229 RMD160 873109a563d03880bf5105ca343572720cf40963 SHA1 04a8b4c20d3af53365e7dbfbc55ab76474c895f0 SHA256 8047350d6ffaeeb20e92cf0a6dbfccf0cbbd2638794c4fc3f77e159e4884c701
+EBUILD kdebase-kioslaves-4.6.9999.ebuild 1219 RMD160 ee16db37a9f03f32f51b6ea30c3a0e5cb288bf86 SHA1 ace1ad8aa597cba8be341bea2328c3c3dc2ae941 SHA256 5b5dca0140925ada7e398016fc5018f417a54bdbbc93c97332b079777f55e1a0
+EBUILD kdebase-kioslaves-9999.ebuild 1219 RMD160 ee16db37a9f03f32f51b6ea30c3a0e5cb288bf86 SHA1 ace1ad8aa597cba8be341bea2328c3c3dc2ae941 SHA256 5b5dca0140925ada7e398016fc5018f417a54bdbbc93c97332b079777f55e1a0
 MISC metadata.xml 257 RMD160 c3d8e831fca8121181dfd47f4bf10b91c4b41658 SHA1 153ca48c830db30d6c39e9cd5dd39d23d7e87331 SHA256 1d6b1fefc7cad1cf2b72338e3bb02748bedcd90518c489af24d61f7c97be6304
diff --git 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
@@ -5,8 +5,7 @@
 EAPI=3
 
 KDE_HANDBOOK="optional"
-KDE_SCM="git"
-KMNAME="kde-runtime"
+KMNAME="kdebase-runtime"
 KMMODULE="kioslave"
 inherit kde4-meta