fix kdeedu 4.6.49.9999 packages

to use git (KDE_SCM="git") and 4.6 branch (KMNAME="kdeedu")

41 files changed, 142 insertions, 348 deletions

diff --git a/kde-base/blinken/Manifest b/kde-base/blinken/Manifest
index d711e629555..215bbc28981 100644
--- a/kde-base/blinken/Manifest
+++ b/kde-base/blinken/Manifest
@@ -1,25 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 DIST blinken-4.6.80.tar.bz2 590474 RMD160 f1c8cbfa939279b67cb96f735a0c9f5d7249ecfb SHA1 847ee81d2a4f5f1acb4bf8c0835c2e8187a631ea SHA256 f2539bb897070df5f4e61ae7a08d52ce158d486f7846bc7a9279efe41d62e337
-EBUILD blinken-4.6.49.9999.ebuild 390 RMD160 a78a53c4811e6675e8af29cac60d3042f3193538 SHA1 2bac457dd93eb4895c524239cdbee226152d8133 SHA256 3732c522b521cfc4501a1e578e056d42209cc62da8a4107c26275a0e107a23d0
+EBUILD blinken-4.6.49.9999.ebuild 494 RMD160 3029dc4698dc1fd42c72f7b0ef860a495522bf86 SHA1 7fc0b05a781592078077cf312b3b9f07d367e536 SHA256 72282c5ed4a1525bb0d4875081aafc96db89afb14b4819b83b68f2100b4ae0f5
 EBUILD blinken-4.6.80.ebuild 387 RMD160 679f2349f47ffded2b763f4285d749193b4f1619 SHA1 86514450cb75331665cf65f0bd425193db739665 SHA256 e160a7ecced4c08402b0304cdd92b3bed1fada17683befa6f4cd9654ae85c288
 EBUILD blinken-9999.ebuild 352 RMD160 9da1b1ab724e9302a41339e91605706b2528dee6 SHA1 593a446b75547ff3ff43167781998519febd1d11 SHA256 bcef00a0264bbf4db6c391ecac6cae459d777d5806faa86e6ff7607c15224fbe
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCgAGBQJN8l54AAoJENwGBM22xffe3V4P/3oApeSvQjvm9E/lHk2rP1WK
-cwEAL1cEx8djSJkXc5eiGQYU8d/pyLyB0uF8K2RIzo7FwvPdR+EshLxkKUnpbr7j
-By0zq7vJ9oG/ddnEMWZScc0nJLiAwS29suL/rID0cQODyVVyJL/avilXhgmkaMZZ
-9aQsufuPzMGFo/01u+yGyR4IVVhLQ6QlW768fDQAlSqmxq862L+sj01jgywSWAYt
-2xVtEgDJ37bbLmuB59aw92ceOXVOGQdWyBU7kci01s/FSzYANWEfT7NQ7hj4ZnM2
-fp1QwTdeDrL/ENe5V2XWds2B/ikKG6r+hQHVcyTXqg2S4Nz5IJiAA5qNjmFy90jh
-L7pDvR8S1xA6Vxpa00m6JyrTMySdHBhTCuxJidjVICQKjf1aVmZ9SntXlwCIRf+y
-95qdAVePpRbLqzKsWCr5wGinIgOrCYmRaRjpDDVcFjoY/XWhWFrp9S85YMAL+Mic
-wEhWiiqGkv43KSRybjtqYhWd1b8ErCPXnZt3jsYo/K9DsjyTMsp8qZuW/VIKDLbq
-TMbjBhKtLXeG+id9Rp6a4Q4TxjZm87P+1gZqf25+vqgY5ePAAsxPglUTnvxO1T/o
-kDN4WDJqfyFLPuNYrLT2DlnJCZW+FZxzsEL21Bgvl7IbD2eWEIiygm8ym/+LAlVF
-o0gCNFDYPs9TJ7MvnT6C
-=B/ch
------END PGP SIGNATURE-----
diff --git a/kde-base/blinken/blinken-4.6.49.9999.ebuild b/kde-base/blinken/blinken-4.6.49.9999.ebuild
index cebea34b2f2..8d736afa365 100644
--- a/kde-base/blinken/blinken-4.6.49.9999.ebuild
+++ b/kde-base/blinken/blinken-4.6.49.9999.ebuild
@@ -5,8 +5,14 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
+KDE_SCM="git"
 KMNAME="kdeedu"
-inherit kde4-meta
+if [[ ${PV} == *9999 ]]; then
+	kde_eclass="kde4-base"
+else
+	kde_eclass="kde4-meta"
+fi
+inherit ${kde_eclass}
 
 DESCRIPTION="KDE version of the Simon Says game."
 KEYWORDS=""
diff --git a/kde-base/cantor/Manifest b/kde-base/cantor/Manifest
index f130d2f59d5..4712f365f93 100644
--- a/kde-base/cantor/Manifest
+++ b/kde-base/cantor/Manifest
@@ -1,5 +1,5 @@
 DIST cantor-4.6.80.tar.bz2 472177 RMD160 a0f77b04c7fb9514d49ccf0a2cb1a2e05c34a2d0 SHA1 0c6ebd5e523bf5fdf01bbf654ce60a55fc72cbe2 SHA256 58218a03f9205cd7168c20a6ca1b2a87a6936f3d3825b5e143b19163033f47e0
-EBUILD cantor-4.6.49.9999.ebuild 1062 RMD160 4270dfd7cf24b275fc0655d6a62562b888e8d714 SHA1 e91eb82dd7c65a21f5e03ce12e08dcea1540ca64 SHA256 9a44366aeb6116b26e097ab5b95930a6c0969646847134c3a89a40578352e394
+EBUILD cantor-4.6.49.9999.ebuild 1059 RMD160 cfed5c7ec4963269a0308abca11fb731d11f2de8 SHA1 3933c06220d7b820d334fe80f6599c187aaed249 SHA256 2db615d344e80fc2d16ca8aee54e2e8fb934315d4ef2fde248eb0aa548c7f836
 EBUILD cantor-4.6.80.ebuild 976 RMD160 5be1eaa24241c748e89e6ee22d1fa3b18f734182 SHA1 3c8d930203e4ef78d699ada31d4a6449ce84fe13 SHA256 51a0c4313622ba47f4043d78e20d15a7da9ec1d64b0d8601181da92c4b29b1cc
 EBUILD cantor-9999.ebuild 941 RMD160 11d130f2be1fab02a986013155371be03a153961 SHA1 472aaa7eb6affe91ef65bb984d74a1584c2c4fad SHA256 aacfe7befa3d5c35d9665b00b16d3b65f70ac4c14873fc58d25d143fd170b272
 MISC metadata.xml 268 RMD160 55459222cc6bb72890859fd7c7f5a4af775c7338 SHA1 61b9d7abf2df98efea9f499089310781a04ef1f7 SHA256 abe252290ec601671838677348ea958615ec4028f1a0d712c2326826d63bbea6
diff --git a/kde-base/cantor/cantor-4.6.49.9999.ebuild b/kde-base/cantor/cantor-4.6.49.9999.ebuild
index f411fedfc6d..b6677036c71 100644
--- a/kde-base/cantor/cantor-4.6.49.9999.ebuild
+++ b/kde-base/cantor/cantor-4.6.49.9999.ebuild
@@ -6,11 +6,10 @@ EAPI=4
 
 KDE_HANDBOOK="optional"
 KDE_SCM="git"
-
+KMNAME="kdeedu"
 if [[ ${PV} == *9999 ]]; then
 		kde_eclass="kde4-base"
 	else
-		KMNAME="kdeedu"
 		kde_eclass="kde4-meta"
 fi
 inherit ${kde_eclass}
diff --git a/kde-base/kalgebra/Manifest b/kde-base/kalgebra/Manifest
index a2a63430077..3bef57c2d45 100644
--- a/kde-base/kalgebra/Manifest
+++ b/kde-base/kalgebra/Manifest
@@ -2,7 +2,7 @@ AUX kalgebra-4.3.2-solaris-graph2d.patch 761 RMD160 b27242af39aa5f46ca4f9eda3cde
 AUX kalgebra-4.5.73-solaris-graph2d.patch 777 RMD160 e5f4dbea1b29185364e3dc7d9fd0afcb9ea92bf7 SHA1 af8160d8ee1df9e98a5b784137c172d2f2b8cc39 SHA256 647d635821591cc1b44d500e50a913a35d0299d39679505ca1511807fb098b86
 AUX kalgebra-4.6.4-nolib.patch 966 RMD160 c85637fc58038d0c35bb321e26915b39cdefa5cd SHA1 ebf44be1efb59310407826ea724f36490befc8e2 SHA256 5f480f5028fb509d68e46d0839b47b7bfb2831a07f08d9ffdd166ef6a45605bf
 DIST kalgebra-4.6.80.tar.bz2 206974 RMD160 6c18cf8f1ebea23b075b31acb45d19e0a1945e7e SHA1 d448a675782157d8c553db497e048231d6eb5f53 SHA256 35db3e24aacca29a30df422e87c3a098c8c544c2cfe091387a2b446d882f1f44
-EBUILD kalgebra-4.6.49.9999.ebuild 1065 RMD160 79cf7a31301e029f7b422336f49726b5451c5f69 SHA1 6a59754e1b63fa591cedf01090548d6582d33019 SHA256 a9786621690ce2f8ce45ec32703ab5ba38ec85e2074792e5c5e32f0907513b3b
+EBUILD kalgebra-4.6.49.9999.ebuild 1064 RMD160 dc63a57d887022e9ffa521d9f9ba0fbde7b19f53 SHA1 4eedf00af2aac5a649aeeae889de7c860edd6012 SHA256 da0b1e380d37faa28171ca0c9f4013c61a6486017650e859aa6f6b0b926f28aa
 EBUILD kalgebra-4.6.80.ebuild 941 RMD160 6f742d4ae33a677e1ef7bc6b183d6796db7fae2a SHA1 14ff0df32f01bcdecc9f621f5b5ec1d6764d7fd5 SHA256 4be3ed3615559b13a5873782b0d16b019335146f73641250e4a0ca1609c88ce4
 EBUILD kalgebra-9999.ebuild 906 RMD160 66d22ebff9c47295619e43e4443a8f1e18d20346 SHA1 d335855e7a20732e6574535f09c4a25d4c8d6b26 SHA256 f5c6ade0ebdf8713113a1c118700adbb0e1915b2d7ccf4ef7e5326e8fa283b02
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kalgebra/kalgebra-4.6.49.9999.ebuild b/kde-base/kalgebra/kalgebra-4.6.49.9999.ebuild
index bc48cac9074..548525a3606 100644
--- a/kde-base/kalgebra/kalgebra-4.6.49.9999.ebuild
+++ b/kde-base/kalgebra/kalgebra-4.6.49.9999.ebuild
@@ -7,10 +7,10 @@ EAPI=4
 KDE_HANDBOOK="optional"
 OPENGL_REQUIRED="optional"
 KDE_SCM="git"
+KMNAME="kdeedu"
 if [[ ${PV} == *9999 ]]; then
 	kde_eclass="kde4-base"
 else
-	KMNAME="kdeedu"
 	kde_eclass="kde4-meta"
 fi
 inherit ${kde_eclass}
diff --git a/kde-base/kalzium/Manifest b/kde-base/kalzium/Manifest
index 1625253c734..a74937f81d8 100644
--- a/kde-base/kalzium/Manifest
+++ b/kde-base/kalzium/Manifest
@@ -1,25 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
+AUX kalzium-4.6.49.9999-nolib.patch 394 RMD160 66eb1c5248077da1604301e360c37024585042f6 SHA1 8ec9cf39ba229f8a366e2272ae1e1de76dfbc791 SHA256 ed1a01a8b6fb8c2fb9b9d9ba75a31a6d3caba0fca020987cf199ac2106d02eba
 DIST kalzium-4.6.80.tar.bz2 4327783 RMD160 5f3a74171d7d142ee58917ac1aeaceb7f6ef4899 SHA1 1ace4d42711904d9556efbe1ff89dc4c803887fe SHA256 0cc06296b3c9af0c989c258d1543f75b3e89250fd7b27e4f61b98a8166aa5b45
-EBUILD kalzium-4.6.49.9999.ebuild 954 RMD160 7ff4c9c3b37780dc373a275317e56ef32bc82b0e SHA1 353dbfcc30346d7d09b004b664cf4b31e7f66e73 SHA256 190543a7739abb86ddc4291506dbcba8a7f3e8a45202dd2790f4e86306fb10df
+EBUILD kalzium-4.6.49.9999.ebuild 1120 RMD160 d44e42b1b4d9dabc118c06dde89c888facbbac43 SHA1 85c3e174036d48744238ac5c78d1a39bad571e5f SHA256 c93f02cfe55d24e3828f62f590e2b36d733e35e7bd37961f853ac1cfa6b308de
 EBUILD kalzium-4.6.80.ebuild 989 RMD160 6f596b4a3d47be28839d62513bdcb74812c6768e SHA1 412c1a5333ff104066502e90293e694d045bb87d SHA256 f54dcca6cbb7bf4531038fd9ad473e6cfd0265db4845384736b8ab06bf10380e
 EBUILD kalzium-9999.ebuild 954 RMD160 20a4acabe8ca30e18ad53f50fa89398b0180e5e3 SHA1 b76d2b9eead570e66e8e8dfe1dcd368d4a5a1a0d SHA256 c3c29b56073968e229928ecf21dbd9d4a30f8f89d95688b9debc2c5ec722ea56
 MISC metadata.xml 295 RMD160 398bff32e939c3fbd95b9c2f0fe26b088ea12b7c SHA1 bf599c6c0998b2b9f7a172f4561dec68b6d31d08 SHA256 568cc42713217c2057a2d61f81a385eed081cdb70b4aac4044b2fb63a1e401bc
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCgAGBQJN8l59AAoJENwGBM22xffeG3oQAJHNNI2eXnQhohxMEwfo0P+a
-1z/hnZQovGtPgefbvOy8mApbJWcyy85r6XNQi6noVxT59gadiUJE9moIFF4Enlsi
-WCGxgrhHKnLvMwiXLZ6o1oUz06DUL4FN2FyxbQ5k5slaCbWDQqm4I4/sMclATE3C
-MQd4uRJj4z3sVfiZjXzP231pNKPp69CrVmujVTd4MNz6mCK2GxsBuvm+28Jw9vsj
-cRN4SVsWQ5d2Z/CTeOjZBi1Rg/ulXjHRmZhz6/lY+PfUNgZiozS2uuRxVgOukNOS
-J0qfJ30Im+WCX3JQx9ry58v3TgLLKSOzVdewF9MzNFiRtnqGZ7OmD8uPvFDDxvpT
-afmXDARBwORNurE/ks9QL6uY5wKAe7uThhDvk0tKP8tazhMcAAnemAv3ALBxdAkk
-YZTX/UocMkEDrEbePLQvtgOBI+gL2p/07Vy9ptZeVfCVhT9177AqpPqpZqNGq27a
-kdWCl5CL2iMOp12QS6wdVQntxc6FfWtcVaP4ELHzQzzitiptH2q1IU4t5yyJd9yS
-xRzAcOqR+rGRUA98+KCgm60bomG7VIhFCzvp0vB1ldhP4J65/QAcZMXBG2N8N8Ed
-IE8Qb/pynjiUZ06CHislNhqHSU6+xFeVsxqPXGyL/X3gu9zJg26OEm7FcExv52pg
-+ut4llCLslOjgcdfWHSJ
-=dr1c
------END PGP SIGNATURE-----
diff --git a/kde-base/kalzium/files/kalzium-4.6.49.9999-nolib.patch b/kde-base/kalzium/files/kalzium-4.6.49.9999-nolib.patch
new file mode 100644
index 00000000000..833ccd6a2d8
--- /dev/null
+++ b/kde-base/kalzium/files/kalzium-4.6.49.9999-nolib.patch
@@ -0,0 +1,9 @@
+diff -urN kalzium-4.6.49.9999.orig/CMakeLists.txt kalzium-4.6.49.9999/CMakeLists.txt
+--- kalzium-4.6.49.9999.orig/CMakeLists.txt	2011-06-12 02:22:54.537552101 +0200
++++ kalzium-4.6.49.9999/CMakeLists.txt	2011-06-12 02:23:12.484578827 +0200
+@@ -45,4 +45,4 @@
+ add_subdirectory(src)
+ add_subdirectory(data)
+ add_subdirectory(plasmoid)
+-add_subdirectory(libscience)
++#add_subdirectory(libscience)
diff --git a/kde-base/kalzium/kalzium-4.6.49.9999.ebuild b/kde-base/kalzium/kalzium-4.6.49.9999.ebuild
index a2ccbebf0fc..0c029b1d4b7 100644
--- a/kde-base/kalzium/kalzium-4.6.49.9999.ebuild
+++ b/kde-base/kalzium/kalzium-4.6.49.9999.ebuild
@@ -5,10 +5,16 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
+KDE_SCM="git"
 KMNAME="kdeedu"
 CPPUNIT_REQUIRED="optional"
 OPENGL_REQUIRED="always"
-inherit flag-o-matic kde4-meta
+if [[ ${PV} == *9999 ]]; then
+	kde_eclass="kde4-base"
+else
+	kde_eclass="kde4-meta"
+fi
+inherit flag-o-matic ${kde_eclass}
 
 DESCRIPTION="KDE: periodic table of the elements."
 KEYWORDS=""
@@ -28,6 +34,10 @@ KMEXTRACTONLY="
 	kalzium/libscience/
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.6.49.9999-nolib.patch
+)
+
 src_configure(){
 	# Fix missing finite()
 	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DHAVE_IEEEFP_H
@@ -40,5 +50,5 @@ src_configure(){
 		$(cmake-utils_use_with solver Libfacile)
 	)
 
-	kde4-meta_src_configure
+	${kde_eclass}_src_configure
 }
diff --git a/kde-base/kanagram/Manifest b/kde-base/kanagram/Manifest
index 8684ab6bc1e..fd4896d3b82 100644
--- a/kde-base/kanagram/Manifest
+++ b/kde-base/kanagram/Manifest
@@ -1,25 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 DIST kanagram-4.6.80.tar.bz2 637807 RMD160 b6bcf5eb982b72cf88106ebe447385c66fdbf0c5 SHA1 b7075ffa2c366acecfce13b5bef9938c6317aefb SHA256 0ae2771e4ab274f28f44ba38a8243cc8f5cf68690673a32f6e8fa3d71f093baa
-EBUILD kanagram-4.6.49.9999.ebuild 381 RMD160 c254f9bc8730ac3a44a500c38dff118810286381 SHA1 642bfcd2bbdf2c41f690a211277c62cbc7f9fea0 SHA256 57b23ac76da9cb1dd8f86167f3f34504afb19ae2b5de44504746786cce97eada
+EBUILD kanagram-4.6.49.9999.ebuild 485 RMD160 482b5edc66617ce399ee2e994d41c5143d2ce715 SHA1 2a7dce5ba10c5784ff3f7b10035213b5b3efbf1d SHA256 29b9f86a95c6c36326cccf5c0b1a2e86ed9ba8064a7c0fe7b680b5260a60c125
 EBUILD kanagram-4.6.80.ebuild 326 RMD160 fa4099c893a8814c0a92bd31305d362cffa2896d SHA1 2bad7cbc5ad59db2e70a5520180b73233b62b501 SHA256 2771e7c93b964d80984c81b02dbc705025101c0224347930f15fa497d1802c65
 EBUILD kanagram-9999.ebuild 291 RMD160 2a9fb07b03e51f50623b5a777684c5e497ad9dac SHA1 e8fd8f590d622b3bf73e2810dabf8ffd8d633b5e SHA256 1476e296dab9a4fd20c3301aad27ea4cd39b7ad9bd83f6ff4ce3eaf0454e9a55
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCgAGBQJN8l59AAoJENwGBM22xffef2oP/iJXWLbdEiHU2WrNI7ZJm4x0
-8flPZF65fM+9gdxzFPlTBqgJL1QqRg5bw4+7yMVuVFw6ROAQNAm0QCt1aKaUilFm
-mepZvWP0pjGkzmyKx6LJPgYMoR70I5NACpI9+jKr/kGavXMJI5CUGEEBppZVpTqo
-XiWnz9wDz3NY/jCt1wKn7r1tQMIVQVOi1jGwPbuJer9U3kqxEpxzc/AR/hymsvum
-P7cB04VYcFObvM0mzNAlH5Pqc7ZOZb44W5VzcaC3ToIsEcTQo+RKIhBWEWj5MS0i
-FSTZgFgPa43MFvg0XcXC+MfqBm9HHaRvbEcicDaaZ2FiTn7TgHpFXcWVB7mIhn65
-3o7JOM3x4rYK0MlQd2v0G7ciInqGC6IDQEMWx+VgthCKC8d/2OzqHy+YJKG8IRfw
-ssG3gSPue4qiLa0WjpS9PenZs7B/UqAJqi93Bd52fIImoohun4zZUL1kyyHs1hoV
-PHs1IUGeB0hDtsfMW3KzZZoCvmMX/+gphMVYancw7yJhm3soHtUh1cXRNwbMw2CR
-nFYILYMutMbinkuJBA/1YAxeV/a/vHH0hjd66mnfP23uGrMvKVQZtHVAksr+Ick/
-JmCOKlUtjyinatfNK7wvZ947GvOgywioHTmwJz40gVoeRQZZdtioHbHFAtdDz/OW
-tvc9ryazG4sf2e58HBw5
-=gXBR
------END PGP SIGNATURE-----
diff --git a/kde-base/kanagram/kanagram-4.6.49.9999.ebuild b/kde-base/kanagram/kanagram-4.6.49.9999.ebuild
index 17a0a853be4..2a095d05dd3 100644
--- a/kde-base/kanagram/kanagram-4.6.49.9999.ebuild
+++ b/kde-base/kanagram/kanagram-4.6.49.9999.ebuild
@@ -5,8 +5,14 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
+KDE_SCM="git"
 KMNAME="kdeedu"
-inherit kde4-meta
+if [[ ${PV} == *9999 ]]; then
+	kde_eclass="kde4-base"
+else
+	kde_eclass="kde4-meta"
+fi
+inherit ${kde_eclass}
 
 DESCRIPTION="KDE: letter order game."
 KEYWORDS=""
diff --git a/kde-base/kbruch/Manifest b/kde-base/kbruch/Manifest
index 589ed8d1dbe..8a84b8b86a4 100644
--- a/kde-base/kbruch/Manifest
+++ b/kde-base/kbruch/Manifest
@@ -1,5 +1,5 @@
 DIST kbruch-4.6.80.tar.bz2 869058 RMD160 81abd555166ff91633b39b9e4c711bd1e15cb554 SHA1 205b7f2171e67b55fc1bbcd0844702daf9dcb4a6 SHA256 612ed2b1c3b17c82c8bb34d4887f827015a238f6fd5a80a9e9e5d043b7b805bc
-EBUILD kbruch-4.6.49.9999.ebuild 382 RMD160 a1a66d912aa35536ee6cab9716cdf1df52d9627c SHA1 ec0b8c8149f8cb48255f5db1abc0231e322b1daa SHA256 bf0ab514877baf2960736a3b2a364ac9908a8036080efca737844921dd46fdab
+EBUILD kbruch-4.6.49.9999.ebuild 381 RMD160 7b52343fb908520148d77b8bc9094b2f7524df67 SHA1 224db56b68bd9cec78987c9547033882ed7c6dd6 SHA256 828a9fe5e936c09bd9ec9cf78ef8b6cb3bccc0b19955ea7dfab2e90c3f674576
 EBUILD kbruch-4.6.80.ebuild 310 RMD160 33547d4280e191a4ef427ba6f9461644bae790d3 SHA1 40369eb005b54299e0aa0ad584b7c6a730236568 SHA256 f7bdbaa6e42c4ba06297020a5e61e888fe6e5e63328588902f1b12fb465da6e5
 EBUILD kbruch-9999.ebuild 275 RMD160 7f685fc9900e4f604eb33b72cf452167d97a70d1 SHA1 aedf1f098afdc9b669e91df1b808459185caafdb SHA256 f299d06832f745beb645b52ac60bc851fd2953950d5eec17495ab757acffc615
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kbruch/kbruch-4.6.49.9999.ebuild b/kde-base/kbruch/kbruch-4.6.49.9999.ebuild
index 801e506091a..23933676a6e 100644
--- a/kde-base/kbruch/kbruch-4.6.49.9999.ebuild
+++ b/kde-base/kbruch/kbruch-4.6.49.9999.ebuild
@@ -6,10 +6,10 @@ EAPI=4
 
 KDE_HANDBOOK="optional"
 KDE_SCM="git"
+KMNAME="kdeedu"
 if [[ ${PV} == *9999 ]]; then
 	kde_eclass="kde4-base"
 else
-	KMNAME="kdeedu"
 	kde_eclass="kde4-meta"
 fi
 inherit ${kde_eclass}
diff --git a/kde-base/kgeography/Manifest b/kde-base/kgeography/Manifest
index 529da7c03a6..3c1c8d95b31 100644
--- a/kde-base/kgeography/Manifest
+++ b/kde-base/kgeography/Manifest
@@ -1,5 +1,5 @@
 DIST kgeography-4.6.80.tar.bz2 6912598 RMD160 7edc5517d0b6c1a1a68bb77ec146337fd89a3d9a SHA1 2d161ef150618780e6f2bcf3a8e19993a5c95fa6 SHA256 9a4711bc6a6f8e3202aa7b696c829fdc3f04e1ec00b9bdf106413a017a5a281c
-EBUILD kgeography-4.6.49.9999.ebuild 363 RMD160 7323543827f8d81d23ae74734fd566405645f6c7 SHA1 06ac6aee2ecd6c12b29063e9634d9c630a2591b6 SHA256 99314a82fd8eb4af228517dcd8e494d0d8d6120ffff9c109759144938d7d12f2
+EBUILD kgeography-4.6.49.9999.ebuild 362 RMD160 cb7d4ad78c431332b6ecaa155c1eab7d0664fd8d SHA1 7501593fa6417c3af6ab3ab2cd54729574784793 SHA256 5aebe1e4eb1dc7e2e1ada7630de4c8b56f248fac83607572a534018b6d450a31
 EBUILD kgeography-4.6.80.ebuild 291 RMD160 eeb98780030b93cb66662f81e56b7e5e85ec66ae SHA1 899b74413fcff1dba5b0cabd664614693d476a71 SHA256 b7cfa6a1cb3cf151833961b90fed89e32156639fe376c490616675f5a5581f2c
 EBUILD kgeography-9999.ebuild 256 RMD160 a7f5a12c8005a4bb0c07a054debc3360717364eb SHA1 5be88e48c54aea540b04bacbae6c45442cfcd3be SHA256 1db074a8930cf5ba87692c3e1947923180f0eb1376ca6acf295956f4570e10f5
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kgeography/kgeography-4.6.49.9999.ebuild b/kde-base/kgeography/kgeography-4.6.49.9999.ebuild
index af576dcacbf..5ed3a9dbdb0 100644
--- a/kde-base/kgeography/kgeography-4.6.49.9999.ebuild
+++ b/kde-base/kgeography/kgeography-4.6.49.9999.ebuild
@@ -6,10 +6,10 @@ EAPI=4
 
 KDE_HANDBOOK="optional"
 KDE_SCM="git"
+KMNAME="kdeedu"
 if [[ ${PV} == *9999 ]]; then
 	kde_eclass="kde4-base"
 else
-	KMNAME="kdeedu"
 	kde_eclass="kde4-meta"
 fi
 inherit ${kde_eclass}
diff --git a/kde-base/khangman/Manifest b/kde-base/khangman/Manifest
index e7f4b19b2bc..27303425552 100644
--- a/kde-base/khangman/Manifest
+++ b/kde-base/khangman/Manifest
@@ -1,25 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 DIST khangman-4.6.80.tar.bz2 1108933 RMD160 056ed7e66055ae821aaec2f06af4b6e38d4d5a9a SHA1 a3e140a71c27400d49f75b862965123c1df6e992 SHA256 5a5289a701f2cf23b2fe8d63dc36d1e61838f23bd3aff40ae574319c7f99c925
-EBUILD khangman-4.6.49.9999.ebuild 366 RMD160 0762179f73fcc0c5786593a5d18ee04247a4fd3e SHA1 26fef430cfb56cc1d0ea651c8e652deb9fc1abc6 SHA256 a91d43e0d3d99822f190ee2c127da68d761611cae1b6876e0cde965fe0cb1e4c
+EBUILD khangman-4.6.49.9999.ebuild 470 RMD160 03589c54b4b6d1203b1a85d638fad4dd37b241d5 SHA1 3ad54458199589b29ff855c2629c6e1f593a1adf SHA256 b9b08e7b17ed69832959b4f9ac1118c298622227fe5e3d8444349875513b8ade
 EBUILD khangman-4.6.80.ebuild 333 RMD160 fab3dc91be943ffebbe4da9b1bfd75bb9cdeab86 SHA1 2e9242d25b7d7e47a5fa8bc3724348b5ca1b33f4 SHA256 76a09eba1ca4727c28cef42dc3041931dfaaf01f65ccc273586690040e393dc3
 EBUILD khangman-9999.ebuild 298 RMD160 ea662fc4073aafb13858b2594afa63b6cb36ebff SHA1 52155652ee619e3a087f25ad614307d6da435d1e SHA256 94ccfe22cdc670b69631e800232964e5c462c958b2f5dee2507de2f189bf3862
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCgAGBQJN8l6YAAoJENwGBM22xffe+w0P+wZk1l24sJ0Xw+JamyjrYXVJ
-BSQyZzlV2ym40FlPcU78V5gjpS8WcGDBOvrL2sgHpas0KdLyuiNkbJEssZjnr1n5
-R+PHbzgXYFOtc5YP2eBjX/kwLjkAlQdrrATLrv53bn4VNmfcXXy73s3Waq5rx8HA
-1a6o5ZE9xCYqkBMQXRiMNdEe3oBcybjZhXohWREuGlS0hv0pnBAA9kQ1T0oI4dd+
-Tn2n+tmlWsk5Ef4Pa2GwbZgk7wjXKHlHJo2x94C/MJxvnhX9t+u3H8cxU6xj2H4w
-CffTQxUvieWE+MxID67InMoqBRMNMEqnzKyh9fbmA7FWE1bI7ka2pinCA+tv7IFG
-npoqs34Ou4y6u94xvx8KwLSTuVri7Wl5yTOGo+lXSi0PktsLGBm//NPCFnGxQ9wM
-JDyvo43q8wVmN3nFGDiT/MMCTN8oWy9b5mDacihYPXTEgnI8OAH1VUH1rso9Pn1Z
-4ox8FOQs75JSOQhRr8kmCrDFz6dyY7phR+Y6VcaX5nO4W8Dd2BDdX6MQNxicCiiA
-dBN5iqHUBABfGD6Mq1zfT3AmhA14QxR8J3mSQkWlvPLSjvzENoT3iEMZ391klQCT
-aSeQ5F0u+VNemyfM1ilqayk1mXH9sdhQ9XlSYJmSaPmQsLXzOIJO6gPUnk9sUTJ3
-94d3LFT/nrJgDZayCc/S
-=afNa
------END PGP SIGNATURE-----
diff --git a/kde-base/khangman/khangman-4.6.49.9999.ebuild b/kde-base/khangman/khangman-4.6.49.9999.ebuild
index e759f15efbd..32708f52c0a 100644
--- a/kde-base/khangman/khangman-4.6.49.9999.ebuild
+++ b/kde-base/khangman/khangman-4.6.49.9999.ebuild
@@ -5,8 +5,14 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
+KDE_SCM="git"
 KMNAME="kdeedu"
-inherit kde4-meta
+if [[ ${PV} == *9999 ]]; then
+	kde_eclass="kde4-base"
+else
+	kde_eclass="kde4-meta"
+fi
+inherit ${kde_eclass}
 
 DESCRIPTION="Classical hangman game for KDE"
 KEYWORDS=""
diff --git a/kde-base/kig/Manifest b/kde-base/kig/Manifest
index a5df14fb295..62d7ae7036a 100644
--- a/kde-base/kig/Manifest
+++ b/kde-base/kig/Manifest
@@ -1,25 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 DIST kig-4.6.80.tar.bz2 1599744 RMD160 e77c2d13a3478b68ad1930b0069aaf1636bd1418 SHA1 d0b2ca69262b1e720be8ab2b6cfb9dd6b5a81371 SHA256 9ac9ed73dd5868f074c405adb90b950e90e27982e48c6e764db538f57fe1cfb6
-EBUILD kig-4.6.49.9999.ebuild 462 RMD160 96c592c306b324d75f6ebb5bf911d67bd19c8182 SHA1 59944c38dcf545dbe5722bb71c912b9b554e328f SHA256 2f8c7091c179827e85c192d0dcd0f8662568544da0d733af70dd136248631e6c
+EBUILD kig-4.6.49.9999.ebuild 570 RMD160 fe1fa48091a38c2002940beacdcb227dc06b5402 SHA1 49ef8cbf3f4f949d7a42cef871b2dfada55a01c3 SHA256 94e321cb64bc6dc98346e57dd39796031244b70985aa9a2e066092f415b887ce
 EBUILD kig-4.6.80.ebuild 495 RMD160 8310a08cbd1c3a322856e5835fc83efb205c7ee8 SHA1 e10e4051dea57b45ded8f1a9bdbb64e630ebb216 SHA256 22c539a8ede5bb46842e93a92aaea193e74ccc6040184840c22e65236ae74a2b
 EBUILD kig-9999.ebuild 460 RMD160 80c8cccff3f82670b602ff23907f2f9af6a653e4 SHA1 3ace5cdc9524472ab93409ef0ca2db31799fbb59 SHA256 67f91c109b05ca67194f09a787f2c6dfbb921012253e5c1f975252895735673c
 MISC metadata.xml 229 RMD160 5ffc2d6f3bff4c78e59c1f32dec4ddf19536db13 SHA1 f092f450da0dd01d5a8b8cb721f8e035c241367b SHA256 6247c2372b40a399f5fdd9924c135935e52acbf0e92115f9514b294bbfc3be34
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCgAGBQJN8l6ZAAoJENwGBM22xffeZW8P/jcAsY72zkjCdYJRb0wCFWIT
-EBqLp97bZTRkiLmAREooh4M5b2OeHQIPJUffZdRh/ovZSgfFWXOYgSUR70zhpYQK
-0gAXQ4nxrYMoXBRaNf/PbwBx73u6bkmxXBrw32WwX3xOMZR0L/a4HYOL723xI8gb
-5qDXs5ZAsdKAogQpQHt1YcqHX5g6B4XHLyNDLP53Dy4NI7P0sQbqwEA465zuXQ/W
-P1A0l6cny1MQgtMMNNnfeckZHgXauiN4bz5xptWyozp/62IKJQ4UDEWP4721bQTO
-McaPGocQfgVo/K4vqufwafKtz83fAErLM6iRMYm8yMk1b4JBMC+qeQNR+tgj897H
-x8OMh8idrOJd9VYo1x0r/xQsgJZKgBNf2Hl+4VD0cEzNNrEXvYIPGUHdKejq99Rx
-BXp2GFJugArGhKvOiJOZct2IVMHUi6DUaZjIDwHR/zLtLlg7FIr3/Baa+tOSWM7t
-XR9m78yGzWOawShgFm58RG0XsMZZzM5J3+bCifqz2qjqa9DoEXJQBvfPi4thIuFw
-NuXll2aoYebeZSY8o9+LC22nMtmprZ8y2vmv7hRwBBCqjVjmWvjHWpXESv7drekX
-9YsZGf8luVkPuDLGzUjLW9SkHjS5YMFk+9Gg3g/2YrWwDdTl2oCC2Us6N9nC1u7q
-qEPY5pMy5hiGGw6Ewn+e
-=kXnY
------END PGP SIGNATURE-----
diff --git a/kde-base/kig/kig-4.6.49.9999.ebuild b/kde-base/kig/kig-4.6.49.9999.ebuild
index 085d9f59466..996a12c64bb 100644
--- a/kde-base/kig/kig-4.6.49.9999.ebuild
+++ b/kde-base/kig/kig-4.6.49.9999.ebuild
@@ -6,7 +6,13 @@ EAPI=4
 
 KDE_HANDBOOK="optional"
 KMNAME="kdeedu"
-inherit kde4-meta
+KDE_SCM="git"
+if [[ ${PV} == *9999 ]]; then
+	kde_eclass="kde4-base"
+else
+	kde_eclass="kde4-meta"
+fi
+inherit ${kde_eclass}
 
 DESCRIPTION="KDE Interactive Geometry tool"
 KEYWORDS=""
@@ -22,5 +28,5 @@ src_configure() {
 		$(cmake-utils_use_with kig-scripting BoostPython)
 	)
 
-	kde4-meta_src_configure
+	${kde_eclass}_src_configure
 }
diff --git a/kde-base/kiten/Manifest b/kde-base/kiten/Manifest
index d2888423837..2022c7302b4 100644
--- a/kde-base/kiten/Manifest
+++ b/kde-base/kiten/Manifest
@@ -1,25 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 DIST kiten-4.6.80.tar.bz2 3928402 RMD160 1ea0c8d671b29ecea98c10d3433e1ff49f010cb5 SHA1 a5120c87015e044b4313e889b80afd608341e414 SHA256 ed2044783073dc9d37fc4945e9263e2fc17e081bcee1a591de787d358a0d2601
-EBUILD kiten-4.6.49.9999.ebuild 265 RMD160 f77c4f94e9746341b977d21ae8e984d0b826e626 SHA1 2e7a5dae44cac1c08e7aaeac182ab64d8a8b62dc SHA256 a94940f0adb26edd029e3e2469aa9fc9742df215fb8a99d686234836dcc2c575
+EBUILD kiten-4.6.49.9999.ebuild 369 RMD160 f57e8b17b6188157643cf3ee5d851b2ae23ffca9 SHA1 8b640e002d0335da7e2a87a562844e488c730669 SHA256 5ef5a2566243b66f680a7aa859bdb1a9329b6140b30be9d3c98aab9455aa332a
 EBUILD kiten-4.6.80.ebuild 298 RMD160 f58308f74d865751998413a65da69bfcabe84033 SHA1 93d9cdba455b8d6af8adc2fcfdd2cc32298322b9 SHA256 cc36e8fde9d79b1673ece334edf8ca5ffd291a02e6d0fe3a56f23d729c575bca
 EBUILD kiten-9999.ebuild 263 RMD160 e0b282f10f370979f4ea3d13f775d31f484a7649 SHA1 99c5f467a5d740658e66734eeaeb6051dd89194b SHA256 ac82bed35d8f43076347923f11639c9bf88758f12d8d051e0d4e4c8b5980c28e
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCgAGBQJN8l6bAAoJENwGBM22xffe1HkP/3LjzaBjFoGDZ9aiPu4mH0Ha
-G8oT/2/YneAJdE8BCx+cD7WeHvdckJ/exC36bqncuTcg+EF+Xc2geutvzoPLYvj+
-F5g3X5ehWA5l5LDjrhiPaKeTbc5akdqw14QsjSFSj49rJgQiROZMgctAyFstyhUn
-V4kgG5w0a3RU8rx8WPCXtF13nRDEn/tfJ2OENqNCyc04ZPGj9iTEQ8a2HqWFhaFJ
-rDVEmCWP3ynKVgsw7a4Yi9Z6E+i6KXgHNRBaUX6k2FuWEpNwTAnsnscyW1d6/VEQ
-wBGSpxM1gpfrmjS9gVZxHVM8CoXnNx+zhZo7DGEEGRc7OH1ItrhrW++greNCLreI
-Hc2WChj15pDXdD1/KPrUcC/bKu75ofT6VpwugsGOPErmbZyCfa2U5kmhCS7Jikan
-UIq+bdDa8bht/B3Wstv5exocuO1d3Fd3N3zguPF+fSXauG8b/USxuf65CV+AxnmB
-fn7OsyJ3n8F9eJpYoJrlrDRA91EInajJCVSyxVBL1wNZ/VEDrKS5hrD0OfB3quMK
-hYi4FpHCFbFfVhEtJ5oRYwgrxHp1ajQRKPcyZ4jKV6JndHYdV7NEA+l83iaOhIYe
-aEfY2H1f/kdKb75b7VeR5o/GmDTwKNcQjLB4nAqDDcvd2dk9hFpdv2Bt2A191LGi
-ldy2i0BHgocmuku3YUlf
-=T6EB
------END PGP SIGNATURE-----
diff --git a/kde-base/kiten/kiten-4.6.49.9999.ebuild b/kde-base/kiten/kiten-4.6.49.9999.ebuild
index d809799a616..ec7cb988f03 100644
--- a/kde-base/kiten/kiten-4.6.49.9999.ebuild
+++ b/kde-base/kiten/kiten-4.6.49.9999.ebuild
@@ -5,8 +5,14 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
+KDE_SCM="git"
 KMNAME="kdeedu"
-inherit kde4-meta
+if [[ ${PV} == *9999 ]]; then
+	kde_eclass="kde4-base"
+else
+	kde_eclass="kde4-meta"
+fi
+inherit ${kde_eclass}
 
 DESCRIPTION="KDE Japanese dictionary and reference"
 KEYWORDS=""
diff --git a/kde-base/klettres/Manifest b/kde-base/klettres/Manifest
index 23ee5c1b1e4..309e016fc77 100644
--- a/kde-base/klettres/Manifest
+++ b/kde-base/klettres/Manifest
@@ -1,25 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 DIST klettres-4.6.80.tar.bz2 2753553 RMD160 d262bc57035c92837c290ebe18467d77a8222413 SHA1 395a1c700eaf1fee83216facbe5442162d383e64 SHA256 aa93ab46ba99e3c9292e25b3ce4ab6937fcbc467fcb71e016bcf832ea4bdf3a4
-EBUILD klettres-4.6.49.9999.ebuild 329 RMD160 7e8c758e26ce6af87af06629bb90873a14cb8353 SHA1 1ed8e9cde5c2c35fa0e59e43b2754f4db8972065 SHA256 b2b2941795234999d015aaf480e16eb4b2db36d71300b55e327756b8d3d793f1
+EBUILD klettres-4.6.49.9999.ebuild 433 RMD160 12331ec1832c6bb5c3004debd8c9cf6307b98fbf SHA1 70c333ca6a63cbebd12d0c8253715cf55056cf0a SHA256 babef89be1389a0023577200d0e41e4f5a37cdd92fb780c1115a1fb631139f52
 EBUILD klettres-4.6.80.ebuild 362 RMD160 c2411b1e9193aef8060029c602cef2a141c53252 SHA1 f5fdc5ee20eff09dadec183d053fde2b64e99e5a SHA256 a1ddbb02e8416bee5f67d91cbf197497122d1676c2efa7da1f966f98d6f18531
 EBUILD klettres-9999.ebuild 327 RMD160 2fdd3cdf3f0dc18379e0413874d1bbc671e5b8f5 SHA1 9280a6699d17e5182314a8ff0651de866e7a52bd SHA256 b54cb9e1845884ff21dc58cd3ef61084fba725067d1715f417ccb92e6c3b41ae
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----