[kde-base] Move kde-workspace to git

97 files changed, 201 insertions, 133 deletions

diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
index 2a86ae80d9c..cacbbaa2df4 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|kdebase-runtime|kde-runtime|kdegraphics)
+	kdebase|kdebase-apps|kdebase-workspace|kde-workspace|kdebase-runtime|kde-runtime|kdegraphics)
 		COMMONDEPEND+=" >=media-libs/qimageblitz-0.0.4"
 		;;
 	kdepim|kdepim-runtime)
@@ -224,6 +224,10 @@ kde4-meta_src_extract() {
 				# 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,7 +331,7 @@ kde4-meta_create_extractlists() {
 			KMEXTRACTONLY+="
 				config-runtime.h.cmake"
 			;;
-		kdebase-workspace)
+		kdebase-workspace|kde-workspace)
 			KMEXTRACTONLY+="
 				config-unix.h.cmake
 				ConfigureChecks.cmake
@@ -385,7 +389,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|kdeedu|kdegames|kdegraphics)
+		kdebase-runtime|kde-runtime|kdebase-workspace|kde-workspace|kdeedu|kdegames|kdegraphics)
 			case ${PN} in
 				libkdegames|libkdeedu|libkworkspace)
 					KMEXTRA+="
@@ -549,7 +553,7 @@ kde4-meta_change_cmakelists() {
 	done
 
 	case ${KMNAME} in
-		kdebase-workspace)
+		kdebase-workspace|kde-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.
@@ -561,7 +565,7 @@ 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 kdebase-workspace strip config install and fix EXPORT section"
+					-i CMakeLists.txt || die "${LINENO}: sed died in ${KMNAME} strip config install and fix EXPORT section"
 			fi
 			;;
 		kdebase-runtime|kde-runtime)
diff --git a/kde-base/freespacenotifier/Manifest b/kde-base/freespacenotifier/Manifest
index 442aec9f2e0..09a81c462d8 100644
--- a/kde-base/freespacenotifier/Manifest
+++ b/kde-base/freespacenotifier/Manifest
@@ -1,3 +1,3 @@
-EBUILD freespacenotifier-4.6.9999.ebuild 269 RMD160 6eb620073974d8f5cdaea4af5daea0f8a4bfe296 SHA1 cb2ba2bc58713f309805cfda88cf31178297e67d SHA256 2cf050ad190c668024b456f4a7d5c8da4dc0fa1fce716f8e83f125cab1c704b4
-EBUILD freespacenotifier-9999.ebuild 269 RMD160 6eb620073974d8f5cdaea4af5daea0f8a4bfe296 SHA1 cb2ba2bc58713f309805cfda88cf31178297e67d SHA256 2cf050ad190c668024b456f4a7d5c8da4dc0fa1fce716f8e83f125cab1c704b4
+EBUILD freespacenotifier-4.6.9999.ebuild 279 RMD160 0376f51d23ad6eccd79636aa7a71f09efca26188 SHA1 c66abd02e8f99903870c1eba59b800fa4b7e78ac SHA256 a566eef404ff2fecce2cf3b95c1da0687a6ba67d82a9956b3dc1549ce5dccd1d
+EBUILD freespacenotifier-9999.ebuild 279 RMD160 0376f51d23ad6eccd79636aa7a71f09efca26188 SHA1 c66abd02e8f99903870c1eba59b800fa4b7e78ac SHA256 a566eef404ff2fecce2cf3b95c1da0687a6ba67d82a9956b3dc1549ce5dccd1d
 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
index 1420707c3c5..9a112ca0f17 100644
--- a/kde-base/freespacenotifier/freespacenotifier-4.6.9999.ebuild
+++ b/kde-base/freespacenotifier/freespacenotifier-4.6.9999.ebuild
@@ -4,7 +4,8 @@
 
 EAPI=3
 
-KMNAME="kdebase-workspace"
+KDE_SCM="git"
+KMNAME="kde-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 1420707c3c5..9a112ca0f17 100644
--- a/kde-base/freespacenotifier/freespacenotifier-9999.ebuild
+++ b/kde-base/freespacenotifier/freespacenotifier-9999.ebuild
@@ -4,7 +4,8 @@
 
 EAPI=3
 
-KMNAME="kdebase-workspace"
+KDE_SCM="git"
+KMNAME="kde-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
index eb702d00e95..03ff847055e 100644
--- 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 648 RMD160 9c6a7d52a223b52f49f350c244624eb94c311a70 SHA1 1df00b852f6e0e974382e7d7d2508f425e2275be SHA256 ce51f785080bcf90c8242d5773d67220025f05d5d6ad59b45abbccde57a35ccd
-EBUILD kcheckpass-9999.ebuild 648 RMD160 9c6a7d52a223b52f49f350c244624eb94c311a70 SHA1 1df00b852f6e0e974382e7d7d2508f425e2275be SHA256 ce51f785080bcf90c8242d5773d67220025f05d5d6ad59b45abbccde57a35ccd
+EBUILD kcheckpass-4.6.9999.ebuild 658 RMD160 b970a59c4d9bd2cfa7664adc5589b2dc51ec6eec SHA1 ae4381634c941e49e4d55629b2786550ba43cfe2 SHA256 22765050ac44443586ce097bb2af2112ca6eda53aaad85ce7c963bfac0c96f2a
+EBUILD kcheckpass-9999.ebuild 658 RMD160 b970a59c4d9bd2cfa7664adc5589b2dc51ec6eec SHA1 ae4381634c941e49e4d55629b2786550ba43cfe2 SHA256 22765050ac44443586ce097bb2af2112ca6eda53aaad85ce7c963bfac0c96f2a
 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
index 0df6eb289c9..64121bbd613 100644
--- a/kde-base/kcheckpass/kcheckpass-4.6.9999.ebuild
+++ b/kde-base/kcheckpass/kcheckpass-4.6.9999.ebuild
@@ -4,7 +4,8 @@
 
 EAPI=3
 
-KMNAME="kdebase-workspace"
+KDE_SCM="git"
+KMNAME="kde-workspace"
 inherit kde4-meta
 
 DESCRIPTION="A simple password checker, used by any software in need of user authentication."
diff --git a/kde-base/kcheckpass/kcheckpass-9999.ebuild b/kde-base/kcheckpass/kcheckpass-9999.ebuild
index 0df6eb289c9..64121bbd613 100644
--- a/kde-base/kcheckpass/kcheckpass-9999.ebuild
+++ b/kde-base/kcheckpass/kcheckpass-9999.ebuild
@@ -4,7 +4,8 @@
 
 EAPI=3
 
-KMNAME="kdebase-workspace"
+KDE_SCM="git"
+KMNAME="kde-workspace"
 inherit kde4-meta
 
 DESCRIPTION="A simple password checker, used by any software in need of user authentication."
diff --git a/kde-base/kcminit/Manifest b/kde-base/kcminit/Manifest
index a7cfbeac4bf..b4c42cb72da 100644
--- a/kde-base/kcminit/Manifest
+++ b/kde-base/kcminit/Manifest
@@ -1,3 +1,3 @@
-EBUILD kcminit-4.6.9999.ebuild 334 RMD160 11739476c3c46e5d6b0248702e748d5d92e776d6 SHA1 9e60fee31dd20f7d8fad9d91d93ad901a61fc2f6 SHA256 ac66b5e23736eff283b73cc2827346ec75c9321fb4268222308e536c432d96c2
-EBUILD kcminit-9999.ebuild 334 RMD160 11739476c3c46e5d6b0248702e748d5d92e776d6 SHA1 9e60fee31dd20f7d8fad9d91d93ad901a61fc2f6 SHA256 ac66b5e23736eff283b73cc2827346ec75c9321fb4268222308e536c432d96c2
+EBUILD kcminit-4.6.9999.ebuild 344 RMD160 85c2d1f408592b3366a45a33d11a5988e660d1d9 SHA1 487431976b128f7831848ca82340a24b70e79642 SHA256 0b17f69ed88f65c4afe47cebcfc3501ec8b72016030a9fd9cbbf605b80393c9d
+EBUILD kcminit-9999.ebuild 344 RMD160 85c2d1f408592b3366a45a33d11a5988e660d1d9 SHA1 487431976b128f7831848ca82340a24b70e79642 SHA256 0b17f69ed88f65c4afe47cebcfc3501ec8b72016030a9fd9cbbf605b80393c9d
 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
index 7ef8c55ba49..4382fc8a8f8 100644
--- a/kde-base/kcminit/kcminit-4.6.9999.ebuild
+++ b/kde-base/kcminit/kcminit-4.6.9999.ebuild
@@ -4,7 +4,8 @@
 
 EAPI=3
 
-KMNAME="kdebase-workspace"
+KDE_SCM="git"
+KMNAME="kde-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 7ef8c55ba49..4382fc8a8f8 100644
--- a/kde-base/kcminit/kcminit-9999.ebuild
+++ b/kde-base/kcminit/kcminit-9999.ebuild
@@ -4,7 +4,8 @@
 
 EAPI=3
 
-KMNAME="kdebase-workspace"
+KDE_SCM="git"
+KMNAME="kde-workspace"
 inherit kde4-meta
 
 DESCRIPTION="KCMInit - runs startups initialization for Control Modules."
diff --git a/kde-base/kdebase-cursors/Manifest b/kde-base/kdebase-cursors/Manifest
index 51cfacfdc9e..e9cedda8d04 100644
--- a/kde-base/kdebase-cursors/Manifest
+++ b/kde-base/kdebase-cursors/Manifest
@@ -1,3 +1,3 @@
-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
+EBUILD kdebase-cursors-4.6.9999.ebuild 283 RMD160 e035119846ddcbd85641a2f5640078e272bee852 SHA1 476b68472b3e1df05343355262cec9b979fe2f37 SHA256 c2ed831b03ec3f9582bf84431c30f8cf23e3dc0cdfad4961c269b35c4c00a874
+EBUILD kdebase-