[eclass] Update kde4-meta eclass as upstream changed the name of the tarballs / kmname

for kde-baseapps, kde-runtime and kde-workspace in the 4.6.80 release.
[profiles/package.mask] Add more apps to the 4.6.80 mask.
[ebuilds] Whitespace fixing.

14 files changed, 21 insertions, 79 deletions

diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
index a5a0f0c5b93..7aafcbc9bdf 100644
--- a/eclass/kde4-meta.eclass
+++ b/eclass/kde4-meta.eclass
@@ -21,7 +21,7 @@ EXPORT_FUNCTIONS ${KDEMETA_EXPF}
 
 # Add dependencies that all packages in a certain module share.
 case ${KMNAME} in
-	kdebase|kdebase-apps|kdebase-workspace|kdebase-runtime|kdegraphics)
+	kdebase|kdebase-apps|kde-baseapps|kdebase-workspace|kde-workspace|kdebase-runtime|kde-runtime|kdegraphics)
 		COMMONDEPEND+=" >=media-libs/qimageblitz-0.0.4"
 		;;
 	kdepim|kdepim-runtime)
@@ -321,16 +321,16 @@ kde4-meta_create_extractlists() {
 					ConfigureChecks.cmake"
 			fi
 			;;
-		kdebase-apps)
+		kdebase-apps | kde-baseapps)
 			KMEXTRACTONLY+="
 				config-apps.h.cmake
 				ConfigureChecks.cmake"
 			;;
-		kdebase-runtime)
+		kdebase-runtime | kde-runtime)
 			KMEXTRACTONLY+="
 				config-runtime.h.cmake"
 			;;
-		kdebase-workspace)
+		kdebase-workspace | kde-workspace)
 			KMEXTRACTONLY+="
 				config-unix.h.cmake
 				ConfigureChecks.cmake
@@ -391,7 +391,7 @@ kde4-meta_create_extractlists() {
 	#   should not try in that case
 	if [[ ${KMNAME} != kdegraphics ]] || { [[ ${SLOT} != 4.6 || ${PV} < 4.6.2 ]] && ! slot_is_at_least 4.7 ${SLOT}; }; then
 		case ${KMNAME} in
-			kdebase-runtime|kdebase-workspace|kdeedu|kdegames|kdegraphics)
+			kdebase-runtime|kde-runtime|kdebase-workspace|kde-workspace|kdeedu|kdegames|kdegraphics)
 				case ${PN} in
 					libkdegames|libkdeedu|libkworkspace)
 						KMEXTRA+="
@@ -559,7 +559,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.
@@ -574,7 +574,7 @@ kde4-meta_change_cmakelists() {
 					-i CMakeLists.txt || die "${LINENO}: sed died in kdebase-workspace strip config install and fix EXPORT section"
 			fi
 			;;
-		kdebase-runtime)
+		kdebase-runtime | kde-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/kdepim-icons/Manifest b/kde-base/kdepim-icons/Manifest
index 4a7389296ea..9f812ec0ed8 100644
--- a/kde-base/kdepim-icons/Manifest
+++ b/kde-base/kdepim-icons/Manifest
@@ -1,5 +1,5 @@
 DIST kdepim-4.5.96.tar.bz2 42326351 RMD160 fe3755ea7b38074348774527de7d78d1375ac62e SHA1 f425f143fe3381be2bb018bab92d89fd112595f0 SHA256 2025357b77d3b1297c7a41c9b2b4475602dfe7cbb80a00dc6ca296d2e61abb59
-EBUILD kdepim-icons-4.5.96.ebuild 279 RMD160 8244ac318e844b29b95d517f87fd849d581482ae SHA1 fd9e7aed29a96ee354a0924f71c12986b4eb494c SHA256 c2d0441af87c77daa542ae29a47507af62c90a23f0e428adbadcf9589b9cbfd0
-EBUILD kdepim-icons-4.6.9999.ebuild 244 RMD160 903585c2b77f918bfdd4c01c5b6da91336fd3f31 SHA1 d4879e800c1701bd19f94817b0bfa0242ca8f596 SHA256 266957f9c8337189c145b734e5230495bc047d6ad050e854bbfccabe8ed43249
+EBUILD kdepim-icons-4.5.96.ebuild 278 RMD160 8e802120e109c9fce0cb1898addd72ec80122673 SHA1 72dd88d3346d6f6cfb4e080c71a0f2aba1fcae0d SHA256 b844adfd747e88f9522d96653ce2adee0cf2dbdb965e66ed5b62c21ffdda9b66
+EBUILD kdepim-icons-4.6.9999.ebuild 243 RMD160 fa2cfa096c6e2a47bb187f5adcc13b5a257044a6 SHA1 976650f16ab9381fc5fbce132d125f2d90aa5ad5 SHA256 8e6350cc9306b2c9fd4a682c0fa10e31c24698b8ca3a5d4f9faaa093435267e0
 EBUILD kdepim-icons-9999.ebuild 243 RMD160 fa2cfa096c6e2a47bb187f5adcc13b5a257044a6 SHA1 976650f16ab9381fc5fbce132d125f2d90aa5ad5 SHA256 8e6350cc9306b2c9fd4a682c0fa10e31c24698b8ca3a5d4f9faaa093435267e0
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kdepim-icons/kdepim-icons-4.5.96.ebuild b/kde-base/kdepim-icons/kdepim-icons-4.5.96.ebuild
index fbc3fd83615..1cf8c647555 100644
--- a/kde-base/kdepim-icons/kdepim-icons-4.5.96.ebuild
+++ b/kde-base/kdepim-icons/kdepim-icons-4.5.96.ebuild
@@ -12,4 +12,3 @@ inherit kde4-meta
 DESCRIPTION="KDE PIM icons"
 IUSE=""
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
diff --git a/kde-base/kdepim-icons/kdepim-icons-4.6.9999.ebuild b/kde-base/kdepim-icons/kdepim-icons-4.6.9999.ebuild
index df19493fe56..dfcee4ac52a 100644
--- a/kde-base/kdepim-icons/kdepim-icons-4.6.9999.ebuild
+++ b/kde-base/kdepim-icons/kdepim-icons-4.6.9999.ebuild
@@ -12,4 +12,3 @@ inherit kde4-meta
 DESCRIPTION="KDE PIM icons"
 IUSE=""
 KEYWORDS=""
-
diff --git a/kde-misc/kannasaver/Manifest b/kde-misc/kannasaver/Manifest
index 38a686a76c9..4fdb3f3c545 100644
--- a/kde-misc/kannasaver/Manifest
+++ b/kde-misc/kannasaver/Manifest
@@ -1,23 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST 16792-kannasaver-1.2.tar.gz 27222 RMD160 bd48217d9438621b168d6487fe4226d80f84aba6 SHA1 f4826c70df5330768708bcef756168b3d04ecc55 SHA256 6db637deea489aa94ed679054fcf6d5f62246b21b3f9122653b34e1a125813a6
-EBUILD kannasaver-1.2.ebuild 567 RMD160 c050234a3834b15148778c2936318e7f6d1763dc SHA1 980108e089d8314ffea258fa7d01207b088ed8b5 SHA256 bde141db19a989b11c756e93a5c9a97e5749264f27126526383e3215eb27a2ef
+EBUILD kannasaver-1.2.ebuild 566 RMD160 531726048c01eb5ed82f8954c48ed3bcd8c32f70 SHA1 a2e1111d2c3d379b2eff8960f735f99cb0c07680 SHA256 b1ee1517ca1470c3c02b3023b7f8b975690af50896c058b5fddebc1041e1a063
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCAAGBQJNuMhYAAoJELHSF2kinlg4/IAP/0M5k0FbKm3OqxiMucQFQ7Hh
-B+zNgpxol3x02O4Uj4ZB1Yz4ObF5wNaypdIGgErMLhjmKlQ+iPRHXScf3QX3N4Oh
-NlovFINt2UusvfRijcct18Qfr/UDtSeSrpVvW4/uWBnPJ9bCx42uRj8bUl+vscmo
-QfRc2CHdpzF4lxXrvY0t7DC9eAxVgdB72gk80h1povoW5rhMN9bMxhs7d0/qH8pT
-MrU336za1/tIIep7XTlHluibh1ucBSoAL6EIDChL6rqgREM1WVF6ZvRIZjdaYYJO
-ZI0aKaAIqrst8LVXiCu1pkChq8tR4gAtWUdMd5wEfInW9FN7Be1WQaI1nPl0WMCl
-mBsunVIxZWeMK7865wMjggG5fLGsMtML1Qsq5Q7DsmCYUS0a79NxK/HSDfkFtFmd
-i1JiBZEkNBKlCsrDuXlz5ge5SI74fBy1eTeZ8iEwtnwFT6NhVZlNwGqHLZXVpiFl
-lRA153U33anSa1nRfrF9F2U+pkGJYkkyuJlEq/h6ZvOB/JNM69vRfKYYQQfyM59U
-CrMnGksHySEF5x0qgdy7dIYliAVKCnT3X9aCGx8oH1WFqg7gS6pW7/xiq5GZJpYq
-zhhKDUO8IYGQymnjS84qQNEkiZUwbrdBUQuphMozOXYoXp+aX6hlwqGNkgEgSRoY
-RqVM6VLIAWO+mEhi9TSR
-=FrTV
------END PGP SIGNATURE-----
diff --git a/kde-misc/kannasaver/kannasaver-1.2.ebuild b/kde-misc/kannasaver/kannasaver-1.2.ebuild
index bda4f20a0ae..3acb52c5262 100644
--- a/kde-misc/kannasaver/kannasaver-1.2.ebuild
+++ b/kde-misc/kannasaver/kannasaver-1.2.ebuild
@@ -23,4 +23,3 @@ IUSE="debug"
 RDEPEND="
 	$(add_kdebase_dep kscreensaver)
 "
-
diff --git a/kde-misc/krusader/Manifest b/kde-misc/krusader/Manifest
index 1d2d8b0aa0f..8c100f1915f 100644
--- a/kde-misc/krusader/Manifest
+++ b/kde-misc/krusader/Manifest
@@ -1,22 +1,2 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-EBUILD krusader-9999.ebuild 425 RMD160 c9971a869430e318b9b64edb15d64e9f51a07f7c SHA1 ec6f4bdbbd68817ff2c64fdf697c0972f9c6f48d SHA256 0fa69fa2d0edd99af50290dd0033c54a78a509f0fe670e076943530ebe219d56
+EBUILD krusader-9999.ebuild 424 RMD160 254d853ac8e947f6204d8c502c5fe730e212b363 SHA1 bc797fadf934311132a6498bf90054474f6bbaf7 SHA256 7d1642683acb5f98b100ccfa5e43652f3642ffb80da1eb2ce5e2e20ca668d69e
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCAAGBQJNuMhXAAoJELHSF2kinlg4aKgQAJWTsUKe2LTXDBUqL+zcZQen
-j6L0ppeeqrj5YaEHohZOB/gk9w3dRaNDZ1PSpoRMJrSmX2ndzw2ZkGwabyWn/Mr0
-rOi5WCgYOHSuoqvnPRRNLclRaOEUS8msXqc/bTAY9qB3Zn1gU3sRSv6r9jsGrVrX
-DYlv0lsiY7qV/UR9Ho3P3NBRxQmQ00wzAEN+CG8ZZA7MdpHfCx0rSas/Yue5ycNU
-G466mXFT1jAAoXeE2B5pA/NfcMff8ZbUHwkDlxLyDgucCQjb/QyDwGtTYOf3Q1IZ
-EGH+6ctRPf5Go0yHkjmHL78csgOhvdTKNxHAOodfMOCWBafWWVYJWZP296YRSL7z
-f/k6B5gNuFnOHmka3NSjHOchTfljouAZYH22GV81Z0tYCJGliAiGhQpDG9jn5r6R
-QImuaOXDZtXiO4JLgTcbyFi+z6mAI4Vs2uMfq5KeuSKjZ6eeTJ17+XKdWncqI68p
-wa9lXdlZ1Kr5jqRCzZnjDBxP29Jtih8eyhmmjTk83zW187kfIJiEVVv8/AYH4usx
-qRX11Ksh6AU9jb1D+fGV9CoL22CaFFXofslOMAX8GaNeEjPvIismRbMMjf455e97
-1z3oAghG7uCBPTzqSn6DCs2IcJAdOITXLFBvR8pcyayYGd7cc/vtVAL6Q1vrxMYh
-X7cpV+14fghZC1G3t/uO
-=2wSV
------END PGP SIGNATURE-----
diff --git a/kde-misc/krusader/krusader-9999.ebuild b/kde-misc/krusader/krusader-9999.ebuild
index fb8330d105f..a57ff1f57ac 100644
--- a/kde-misc/krusader/krusader-9999.ebuild
+++ b/kde-misc/krusader/krusader-9999.ebuild
@@ -15,7 +15,6 @@ KEYWORDS=""
 SLOT="4"
 IUSE="debug"
 
-
 RDEPEND="
 	$(add_kdebase_dep libkonq)
 "
diff --git a/media-sound/kaudiocreator/Manifest b/media-sound/kaudiocreator/Manifest
index c62f6b86cd1..0483b9b03c9 100644
--- a/media-sound/kaudiocreator/Manifest
+++ b/media-sound/kaudiocreator/Manifest
@@ -1,2 +1,2 @@
-EBUILD kaudiocreator-9999.ebuild 542 RMD160 e50dab4e2ba6b71046f72f3b4d67001fc7335e8d SHA1 52065197583ef1bddd4a97069bcda1419f43eab1 SHA256 813ff4f7dabfd72a739406cd6e8f9c502efbc4463b62b642cf158e29be6211fb
+EBUILD kaudiocreator-9999.ebuild 541 RMD160 f427505af533473459139369020f06a726882d9e SHA1 de524ca572ed9d804b49935ab320a7e217c17cd3 SHA256 020cb9fdf7bdaa053c1909125b036f7eae743bfae27b142dbb33ecc009cd4ae7
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/media-sound/kaudiocreator/kaudiocreator-9999.ebuild b/media-sound/kaudiocreator/kaudiocreator-9999.ebuild
index c8aea37ae76..a6d44dc5ca8 100644
--- a/media-sound/kaudiocreator/kaudiocreator-9999.ebuild
+++ b/media-sound/kaudiocreator/kaudiocreator-9999.ebuild
@@ -23,4 +23,3 @@ RDEPEND="
 	media-libs/taglib
 "
 DOCS=( Changelog TODO )
-
diff --git a/profiles/package.mask b/profiles/package.mask
index 611277996ec..8afc9a095bf 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -15,6 +15,10 @@ kde-misc/daisy
 ~dev-libs/shared-desktop-ontologies-0.7.0
 ~kde-base/kde-env-4.6.80
 ~kde-base/kdelibs-4.6.80
+~kde-base/kdesu-4.6.80
+~kde-base/kdontchangethehostname-4.6.80
+~kde-base/khelpcenter-4.6.80
+~kde-base/nepomuk-4.6.80
 ~kde-base/oxygen-icons-4.6.80
 
 kde-base/akonadiconsole:4.6
diff --git a/profiles/package.mask.d/kde-4.6.80 b/profiles/package.mask.d/kde-4.6.80
index 013258139bb..613b3e8d6c7 100644
--- a/profiles/package.mask.d/kde-4.6.80
+++ b/profiles/package.mask.d/kde-4.6.80
@@ -3,4 +3,8 @@
 ~dev-libs/shared-desktop-ontologies-0.7.0
 ~kde-base/kde-env-4.6.80
 ~kde-base/kdelibs-4.6.80
+~kde-base/kdesu-4.6.80
+~kde-base/kdontchangethehostname-4.6.80
+~kde-base/khelpcenter-4.6.80
+~kde-base/nepomuk-4.6.80
 ~kde-base/oxygen-icons-4.6.80
diff --git a/x11-themes/oxygen-gtk/Manifest b/x11-themes/oxygen-gtk/Manifest
index 3fb4e9c54a2..aa13a61faa6 100644
--- a/x11-themes/oxygen-gtk/Manifest
+++ b/x11-themes/oxygen-gtk/Manifest
@@ -1,22 +1,2 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-EBUILD oxygen-gtk-9999.ebuild 870 RMD160 519cc000251a2af6cf2fa308de61e6d9e7674e03 SHA1 35a56d98a017b5a92240bd3466855f4ee624a9e0 SHA256 5db8e2f82a66b93a7d7bb327699eddd1fb83696e62ec410f1ca95d67ba773c99
+EBUILD oxygen-gtk-9999.ebuild 869 RMD160 aaece0329d2ef3ebe92eeafb3f7bde2005a80d8e SHA1 f423df806e08a35972f6fb53ec03aeea478bbdcb SHA256 7363463fd999babaa2026c913a9cb02d9b69e6ebac3317cb5cf65a7a20949b15
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCAAGBQJNuMheAAoJELHSF2kinlg4r4EP/2CtFRNrDboRGMGo+jdCRZbF
-Khba9UX5ch2+hVq9osNu8qlIsMKEkD4qw5fCLEQ5aZ/knRHdmJjF+HssuHd/dXVy
-3eSB9x2/RjZ/oOzJHVQWfEGjj8fZw6QwiB/akGzZts3Bz/yWIAWvgRLdzWH/a5uV
-YlUkSjkDNgyTvf+uX4jgso7Mr8fjSfelHDY7hIZ5c+otqlCwNAhQpnNQTPXFKQB+
-SvD0F8UBcVmQNZ2AfvrROPieQF+ISUppb9CX3n6iKWUeTMG1SuJxqQA8kla+2Z7O
-W3yum+3jBXgCysJGgZ367vquErIqadR0h07wncNaRbcUZFM5HZHiXgtkVzi7C+zf
-OP0HbXOw3soIf4tnMpaM+fwGIf4+OPRaPOEI0poO1NO0Bei5SvlQNUPvivZHKoHt
-avlnlq/zRmQldQ+FjcHlO+AH5w1imeC2rcTUaOb5Y4jbZf7ichY5JqUETwdmzG2v
-GBRVQ1+3dZk07jq0TuKfUOIN5oipVVahbNuykJ0lFI+2QwDqrSmiJpW4RsTEQ8/p
-6exzHyhW9hbur6yDiG9aeGAxIK53TyHi74HP6OwYM3cDz0e1w3/TnT4M+VPCo+Ts
-QUT+SIYHQHqdoEOcME7G0iHzvWkR6H4RR1faHUQy1rmyq+dGx7I/7NE90O5pDu1J
-IrE7VofdslkGyT8RG33y
-=RlhL
------END PGP SIGNATURE-----
diff --git a/x11-themes/oxygen-gtk/oxygen-gtk-9999.ebuild b/x11-themes/oxygen-gtk/oxygen-gtk-9999.ebuild
index 23fd418e900..afd5488c05f 100644
--- a/x11-themes/oxygen-gtk/oxygen-gtk-9999.ebuild
+++ b/x11-themes/oxygen-gtk/oxygen-gtk-9999.ebuild
@@ -42,4 +42,3 @@ CONFIG_PROTECT="/usr/share/themes/oxygen-gtk/gtk-2.0"
 EOF
 	doenvd 99oxygen-gtk
 }
-