[kde-base] Use new kde4-meta-pkg.eclass for meta packages

68 files changed, 397 insertions, 632 deletions

diff --git a/kde-base/kde-meta/Manifest b/kde-base/kde-meta/Manifest
index 94a350af2dc..45734249efd 100644
--- a/kde-base/kde-meta/Manifest
+++ b/kde-base/kde-meta/Manifest
@@ -1,24 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-EBUILD kde-meta-4.6.2.ebuild 1154 RMD160 1b71889863a61476635a4baa0a3b62aed386fce0 SHA1 97ab48f49870661660102f1c854a7d82edaabc45 SHA256 ca07305acf46209f19b3127c261b695503199d7d8e29ee221d7406e42570a9fc
-EBUILD kde-meta-4.6.9999.ebuild 1107 RMD160 a96b854521f69c2b78899830d3d787a5e824d0af SHA1 2a9b9b581d6bbf9096f18fe82ad083ab6fac3999 SHA256 ab552d45fc4ff2001fbaef40cc3e3a7842a7f3b4ba9314837ed2cafef1c1b4b8
-EBUILD kde-meta-9999.ebuild 1073 RMD160 c63a83517341b05756d6a8c63e8d3ecbe18881f0 SHA1 6f3652d6ffdf633955907eb26d35fa1c3f74f0f7 SHA256 f2edb33669da7359ffbdb6c70d7cff9f17816194f996453dfdc86b70b9938323
+EBUILD kde-meta-4.6.2.ebuild 1057 RMD160 80b22da182c9358c1fbcd659f67afbd28c7d3847 SHA1 5b896b71a71a6d0c96970c8cf50032180367a0ef SHA256 08dd5011f5c9615294e4a78ffa12b8a3c20f57cb391545fac85b3d3412ee81c3
+EBUILD kde-meta-4.6.9999.ebuild 1010 RMD160 9de19dcdb509840cef384919f1f0b810480dbf9a SHA1 50cc2bf2b0c944f82ab7dc7f15b43f882f3a3e4b SHA256 d0ba84988ff1af40a651d7547a83eeb60849c2ba5c5b4b29df474ea33551291d
+EBUILD kde-meta-9999.ebuild 975 RMD160 06163a4f06e3606b77988495540faebbaf1a7d34 SHA1 bca556be6001d368116cb3a5260c46771645e687 SHA256 c13c8d72004872e2935714ecb049a0f8a3cc1e5b7cb442765a2809d97f39335c
 MISC metadata.xml 244 RMD160 827737ba05684e7925be58401a2f475f417eb4f0 SHA1 8dee217fa20f2b5a62fdc4433cd1f34830d00412 SHA256 48a9fa38c6fbe660af0d2b54c60168214c3970ec9d6037a9ff6154f67ef1c7d4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNllC2AAoJENwGBM22xffe0tEQAJUtjh3aarOJYLIDtEgihEL4
-Ci3nxenxbZhaR+wS3B5cxLO57Wxw45vaLc49s5H23RDKF3cWqULA2HJhMnKg75qW
-ZOyb4uy+ksCOx9f7rREItAFeoZZJQuPR7v9bCGJ6WLJHELCxJtx0W+rFqSZw9Ydd
-hBkuvfB8OJGVgwnDY3LfgCnUpSSfxODDviCYMd0mB+YGwTagLCuS9KbDSo87Lw/Y
-Jg6cQ57iLw8zGh764UVjrU5KOxk1uawMKyJ2u7tAjSvCVZ2Jmbe1QrUyuDaEHiDt
-Rd065LrTsKuvXsmsO4W8dAqBDqzlKktrIMAS0nz9Z+WcrzuqVfWBo6X4n+Ms44+4
-p4LQ4IrPb34oyVNuOXTsgZevjbLGjPaWiywZbZ5WkiVjC0DqY/ths2lG5wCXczd9
-SeTiyGBhMY+sx8fH7ehysNYDsc4aVBHPIYwrQqQxEv+Y9shsMurc5gbnDXlKJlP6
-m24mBhKZJm0xuhcAEkH6STd5UwDdynRggVBx3Gob1xJeHwb24SMYk3RLIVtkyeAv
-rKx6k+pUDK96DE6wWq72kPKkrq985C7pLpfkoe6hoIkCfqqpvZoAtGI+ZGUbS5Um
-yM1a98/REBEi+PojOUBRRj1mwFx4OLeTMIupPk60V9wo9h7JBtoK5zOElL1nJyAe
-cbfetTGi8zfFIK3y29En
-=ET35
+iQIcBAEBCAAGBQJNmg4NAAoJELHSF2kinlg4N6AQAIxcLHFqv7ePWSuup0Y2bXGb
+Y07ZUrKJ/U9McH2CPrp8CGn4lB88+y361b9gCK8pf6Jkkke4RLQDgVcVbLTlBeW9
+vTbJCuIDh/ugtj1rE6juL2SL0dqE8Y70N0TxXE/WGvjJU/3yDKkSL32A6vwcahTj
+C07YoaFYoilevI2ZV/viBRPwGfW/n18I4FoyzvkXsaJPdVMwF4hnXvWH+QJCHyOd
+ggplXiCYjOrvVVOj7YJt9njylHMbKlUMM1is1R6rzRyohPI0Ml0h5nLJpcRf6eQY
+02QBaMztt+DLxZe/5Wll/FEArhaFjgIz8rXY4I6wtIPNZciLGTwnfO0HYVAoTqqU
+dkQ0inSWP07e5AGDxFn7ahjw51g6EJcsa7nZTJFvtPvDAwO39hytuYunT/KrXYT/
+xC8FtWKlaw4xD7dUggETNeVfELib2cAfgs9OrkYorszWBysvW+zNMJwRIo3I1efZ
+U/GDmhg4VZg9N7NKs0Ew1cMQaPoLCMLSDA+QiqrJlzoIxuIj3/WhUHjNKEq3Rebk
+YbJMGlxcMDh4W0w1TxQZ91jEbWuCCyEcG3+dLkPc7JokOj966HVzIdo6hlCe4UdX
+lnpfcJ2Y+EGCjRaH+gAIrG3eeHDU/eeE9UdxjyDlKmk7RHUqokyMpPX9n/06GXz8
+F7I7l/A04Y3Viqs8lB/9
+=FWL2
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kde-meta/kde-meta-4.6.2.ebuild b/kde-base/kde-meta/kde-meta-4.6.2.ebuild
index e2c1f99f8b3..2d1d4a67801 100644
--- a/kde-base/kde-meta/kde-meta-4.6.2.ebuild
+++ b/kde-base/kde-meta/kde-meta-4.6.2.ebuild
@@ -3,15 +3,11 @@
 # $Header: $
 
 EAPI=3
-inherit kde4-functions
+inherit kde4-meta-pkg
 
 DESCRIPTION="KDE - merge this to pull in all split kde-base/* packages"
-HOMEPAGE="http://www.kde.org/"
-
-LICENSE="GPL-2"
-SLOT="4.6"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="accessibility aqua kdeprefix nls sdk semantic-desktop"
+IUSE="accessibility nls sdk semantic-desktop"
 
 RDEPEND="
 	$(add_kdebase_dep kate)
@@ -34,5 +30,4 @@ RDEPEND="
 		$(add_kdebase_dep kdewebdev-meta)
 	)
 	semantic-desktop? ( || ( >=kde-base/kdepim-meta-4.5.93 >=kde-base/kdepim-meta-4.4.9 ) )
-	$(block_other_slots)
 "
diff --git a/kde-base/kde-meta/kde-meta-4.6.9999.ebuild b/kde-base/kde-meta/kde-meta-4.6.9999.ebuild
index 38da9fa80c8..7d5dc089c16 100644
--- a/kde-base/kde-meta/kde-meta-4.6.9999.ebuild
+++ b/kde-base/kde-meta/kde-meta-4.6.9999.ebuild
@@ -3,15 +3,11 @@
 # $Header: $
 
 EAPI=3
-inherit kde4-functions
+inherit kde4-meta-pkg
 
 DESCRIPTION="KDE - merge this to pull in all split kde-base/* packages"
-HOMEPAGE="http://www.kde.org/"
-
-LICENSE="GPL-2"
-SLOT="4.6"
 KEYWORDS=""
-IUSE="accessibility aqua kdeprefix nls sdk semantic-desktop"
+IUSE="accessibility nls sdk semantic-desktop"
 
 RDEPEND="
 	$(add_kdebase_dep kate)
@@ -34,5 +30,4 @@ RDEPEND="
 		$(add_kdebase_dep kdewebdev-meta)
 	)
 	semantic-desktop? ( || ( >=kde-base/kdepim-meta-4.5.93 >=kde-base/kdepim-meta-4.4.9 ) )
-	$(block_other_slots)
 "
diff --git a/kde-base/kde-meta/kde-meta-9999.ebuild b/kde-base/kde-meta/kde-meta-9999.ebuild
index e71334657ad..433f02b9d73 100644
--- a/kde-base/kde-meta/kde-meta-9999.ebuild
+++ b/kde-base/kde-meta/kde-meta-9999.ebuild
@@ -3,15 +3,11 @@
 # $Header: $
 
 EAPI=3
-inherit kde4-functions
+inherit kde4-meta-pkg
 
 DESCRIPTION="KDE - merge this to pull in all split kde-base/* packages"
-HOMEPAGE="http://www.kde.org/"
-
-LICENSE="GPL-2"
-SLOT="live"
 KEYWORDS=""
-IUSE="accessibility aqua kdeprefix nls sdk semantic-desktop"
+IUSE="accessibility nls sdk semantic-desktop"
 
 RDEPEND="
 	$(add_kdebase_dep kate)
@@ -34,5 +30,4 @@ RDEPEND="
 		$(add_kdebase_dep kdewebdev-meta)
 	)
 	semantic-desktop? ( $(add_kdebase_dep kdepim-meta) )
-	$(block_other_slots)
 "
diff --git a/kde-base/kdeaccessibility-meta/Manifest b/kde-base/kdeaccessibility-meta/Manifest
index 35ea800203f..8ccf32a598e 100644
--- a/kde-base/kdeaccessibility-meta/Manifest
+++ b/kde-base/kdeaccessibility-meta/Manifest
@@ -1,24 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-EBUILD kdeaccessibility-meta-4.6.2.ebuild 658 RMD160 e5d7934ca7873faaeb07c6f3d4dd496f71e13d89 SHA1 e0cdf6d665bb7c827bacd6e918342d1e5549975a SHA256 68d1e3900263b65d97ac50e260427ccb12f3a5f5b519c1424c15d4352b07079c
-EBUILD kdeaccessibility-meta-4.6.9999.ebuild 611 RMD160 b78c03d5cc3f7dc8bb81d82bc68226b23e18676f SHA1 1fa32ab7d88231535ad17182700a0a6013ea3f8c SHA256 e7aad8ef52a0bbf05ab4255bf20fdf3bee6fa6abb82633485071a51abfdc757f
-EBUILD kdeaccessibility-meta-9999.ebuild 612 RMD160 a1c00532eda57d3e2a62173e006131d433ef4bc2 SHA1 7ad6e3d453b0d87a54cfdab3cfa03993570dcc87 SHA256 3de27e8d1976d6c9776a262b1a3eab0c998028fc87dfedcb67626d5208a89fda
+EBUILD kdeaccessibility-meta-4.6.2.ebuild 562 RMD160 818d829e20f5dd0a2edab93a0fbe89832546d6fd SHA1 e1864ac1f4c0e049bf442767352743341dc4b7d4 SHA256 2c4a8c229ca381b8b07de43d1bbd714c6cfde7afc258c239cb561bc2b1a74a71
+EBUILD kdeaccessibility-meta-4.6.9999.ebuild 515 RMD160 4bc9988405c4dbe56c9b3b13e34da107d39470f7 SHA1 cf2364032734ad9b6dc9617014f5bc747cc89ff4 SHA256 ffbe694b4d9c4bdfe8fdd8ec798c47a246af807efc5eb83c8ff5a29875500cbc
+EBUILD kdeaccessibility-meta-9999.ebuild 515 RMD160 4bc9988405c4dbe56c9b3b13e34da107d39470f7 SHA1 cf2364032734ad9b6dc9617014f5bc747cc89ff4 SHA256 ffbe694b4d9c4bdfe8fdd8ec798c47a246af807efc5eb83c8ff5a29875500cbc
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNllCrAAoJENwGBM22xffe7SoP/iHLi3cbU0Oghgw/TTkKOpCH
-ZIdgX7jgzXNr6a8Hz3Q92f9QbRhu8rWk6XaGJguXqucWP5Xa1AZi86I1uGdnrToh
-Ye2Kibnt+kpRPxlbZdKh9Qk2+i+FtmcP6tgj4vGri6Ia09aAtmJOrqCArqGZFAZq
-SdO6cXySXcEHb/NsbLAS8UG/HiTGAQEg12zlzifkHkHrTcqzHTLhMKchkNiMRmaX
-ZF6zfQyoY5vGpK2RxydOKXd4EHflnkywLeAqksxrMkNkxgyH/PypZqS0iws7LGnP
-faJGDjtwm+yK7oY9EmU/D4VrCVXyrPBcTfUaU/ZvM/glTAqB823ymFqfX/fFXJyx
-O++dYyhWLpFsbQNKVkbx2Rn2iPzrsjF1EvvXuXIC5N1VOPzyDDDPqtGNLutZkQ/c
-kP4YlVa9uLRcHYq3NgaauYDu8bekYaW57X5v2PNXvAOuaIkNobRaB9luHLssnFK2
-H0WFzw/X0clUpC00sByICv/Jt/MyoVhdZ5MyRArNgy39MlOmbydauN8aq7ce/DZf
-G7vsO7ae0VwHQSUsKW+asrFLKDB8JwZWZ8zuPy8oXFBmpw2CPdg4GRDKnVbJTfJ5
-PgOJNfaxu2BpbpZ7q/oB8jCZ8RBiGAEALRQfJqnNlh9iJsiRyFANbh9pbLuNMHHj
-jCijNUMYHKu0c/L5S4lP
-=OSfR
+iQIcBAEBCAAGBQJNmg3wAAoJELHSF2kinlg4iqcP/j2Vu8UPkLOahJ3Sse01xtLY
+1DwS9kDRjK7flam1J/GD0ds60WP4tKpA7V3469G/M6fQ9D/ivryw1Zkkn+vxla4B
+xyWBRolRtft+pwKLKJ4niEm1dcnHWs78LbCrFxW2y5hQqHA5RMSaUjZagwLrcuFV
+PT/eeALx8ma/gMrHDJmXeP6nQKd7GODJNespU6U5NqGRRHEViixRsB3FVrWZwmfO
+Mnwyy2NWFqij2wZ3XT7nb0Z469Zt82ldMmIxp9jOCNjVMtxDZzc/+mRTP4j9n2oo
+9Z1OE9W2EqLrw8OtVW1kcCT1XmXU9gfJO6u0zq9MboiTDwEEdmO7FtE9wHVYjfsg
+ml8csBfM4uy36dOayiWJ0JzdqfKch05fvSlHUUhuTAciiI0SwFlmYgctZqUFsyET
+xFNC8dz6BQk8MqN4rTd/z/O9FL6vTsuF459nSZPO+sVzfKLDdJgUtYfYKjjvZKCD
+aWhIC33NxD0RmPh3PI2Zo34IETJoHXmTz2MDN+n0bS5YausqDKbZ/AYQPVQoh0Zh
+JrM6uue9o5IP0nJZ9G9rq5rDAthI+v3Dnf3D/tChJRPpV9H3pEwwrFYP5ZyIp+K5
+XFw/3sCiQzyLPKiLZnYaoRJaIjwR69rzQQNlv5pTkUPL190rujwaLc2HRMLOlK2q
+BEdHAX55fQ0VOhqPzOeu
+=5qBE
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.6.2.ebuild b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.6.2.ebuild
index 56822a54df7..f3f4d417b6f 100644
--- a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.6.2.ebuild
+++ b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.6.2.ebuild
@@ -3,15 +3,11 @@
 # $Header: $
 
 EAPI=3
-inherit kde4-functions
+inherit kde4-meta-pkg
 
 DESCRIPTION="kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages"
-HOMEPAGE="http://www.kde.org/"
-
-LICENSE="GPL-2"
-SLOT="4.6"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="aqua kdeprefix"
+IUSE=""
 
 RDEPEND="
 	$(add_kdebase_dep jovie)
@@ -21,5 +17,4 @@ RDEPEND="
 	$(add_kdebase_dep kmag)
 	$(add_kdebase_dep kmousetool)
 	$(add_kdebase_dep kmouth)
-	$(block_other_slots)
 "
diff --git a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.6.9999.ebuild b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.6.9999.ebuild
index de9f0ecb1c3..3ea2a874798 100644
--- a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.6.9999.ebuild
+++ b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-4.6.9999.ebuild
@@ -3,15 +3,11 @@
 # $Header: $
 
 EAPI=3
-inherit kde4-functions
+inherit kde4-meta-pkg
 
 DESCRIPTION="kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages"
-HOMEPAGE="http://www.kde.org/"
-
-LICENSE="GPL-2"
-SLOT="4.6"
 KEYWORDS=""
-IUSE="aqua kdeprefix"
+IUSE=""
 
 RDEPEND="
 	$(add_kdebase_dep jovie)
@@ -21,5 +17,4 @@ RDEPEND="
 	$(add_kdebase_dep kmag)
 	$(add_kdebase_dep kmousetool)
 	$(add_kdebase_dep kmouth)
-	$(block_other_slots)
 "
diff --git a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-9999.ebuild b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-9999.ebuild
index 834c1863267..3ea2a874798 100644
--- a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-9999.ebuild
+++ b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-9999.ebuild
@@ -3,15 +3,11 @@
 # $Header: $
 
 EAPI=3
-inherit kde4-functions
+inherit kde4-meta-pkg
 
 DESCRIPTION="kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages"
-HOMEPAGE="http://www.kde.org/"
-
-LICENSE="GPL-2"
-SLOT="live"
 KEYWORDS=""
-IUSE="aqua kdeprefix"
+IUSE=""
 
 RDEPEND="
 	$(add_kdebase_dep jovie)
@@ -21,5 +17,4 @@ RDEPEND="
 	$(add_kdebase_dep kmag)
 	$(add_kdebase_dep kmousetool)
 	$(add_kdebase_dep kmouth)
-	$(block_other_slots)
 "
diff --git a/kde-base/kdeadmin-meta/Manifest b/kde-base/kdeadmin-meta/Manifest
index 0439c70b5b8..00abfcd3464 100644
--- a/kde-base/kdeadmin-meta/Manifest
+++ b/kde-base/kdeadmin-meta/Manifest
@@ -1,24 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-EBUILD kdeadmin-meta-4.6.2.ebuild 564 RMD160 d1a45847341b08e2db4193d15f38a60d9f969e20 SHA1 673726df38e037851542ba0fe65d90b1d35076e8 SHA256 b768f16eb7d38027aad4e0f5ed5064fd61f21da3f6f2f29ba62092081cdf44f3
-EBUILD kdeadmin-meta-4.6.9999.ebuild 517 RMD160 67d36d9daa43f3ff523a7af5ea25f6f65703f3ff SHA1 ff505eebdcb2d8b7111694df7989e0a68726b9f4 SHA256 06b7a6b458c0869105d191139301493a11ff6b5e49d23b0e26a951caae4139e7
-EBUILD kdeadmin-meta-9999.ebuild 518 RMD160 695f55e4557b7490313c167b10e6f4f449d4e227 SHA1 f76291b35f584787af916c20fd628da33656504f SHA256 4a8cb6442bb971e5dae668791b6baa6483c78af5d7208dd48c8f4610603e6a38
+EBUILD kdeadmin-meta-4.6.2.ebuild 467 RMD160 467efa982e6bd08f28cb98513cf6fd2ddca4d58b SHA1 eb2447db824b18223f1678cb6bd39393f9a75dbf SHA256 371544b97f3ddd557f88a12a95d4b2bfca146236da0239f0262e7b1c23530bdc
+EBUILD kdeadmin-meta-4.6.9999.ebuild 420 RMD160 5d0c4acb2cd72bac6e37797d2d18e23d493c4728 SHA1 a81aab948b46ccdf4cfe9f2af6c70aeeb5e5afad SHA256 46d27695fe6cf7c7a45b9111532eed9d1902bde55b24926753c3a9da31060845
+EBUILD kdeadmin-meta-9999.ebuild 420 RMD160 5d0c4acb2cd72bac6e37797d2d18e23d493c4728 SHA1 a81aab948b46ccdf4cfe9f2af6c70aeeb5e5afad SHA256 46d27695fe6cf7c7a45b9111532eed9d1902bde55b24926753c3a9da31060845
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNllC4AAoJENwGBM22xffevxsP/jOWTNU7GoRlaGpdrE2H6XMm
-TcRP8BpyhkxgzfpzkfZ/jbKNstCzlMacCBquEAyEu8Xd3WYqTA5/0Ub3t4Mr49BT
-mGt8D1cB4ziiuWlNO69FRaH7QSkuCuL5WnZa3kupgRyiPsMcLoQj6RmFF+ZTpldj
-NrqDWo2NBjv3fVoss86Qe4u0tk8/T7hF2HFJOMMEuuSCQcw0KNeeLDLZC9Mam92K
-sgNgYLBjpa4d466YKGDLSWfq5MvWwlCFAvWu8ayUX5RQ/6SYkcx2COAqLB4ArG1Z
-HAlP04k9jIJPSAhF/RscuxhT/0ZMP0hWXx7bRRkOyTijxK+AsXGvalhtU99kaZrz
-zkwkfdImdpUa1uWFAM2/H8ZHCdnYBHCgDKNHbVD2Lh7JEFX0N5iP8Kx6l74A/9kH
-eMXnxJLI1hq5F0LGeIv83d9Cga5FttnpbMvL4sCR9fxG9iktijG95VRkmDhZsqOI
-dLWwBx2pQ0K8VYNgtKwP8T9ZcgzUxzA1YNShnv2f87p0vq6K1W8VgJBMIJ5jljZs
-2ULpIR67yYmlxtcRbeohy8bDRhhiQhOYLZb4hoVIMX8TQMk23lwp3qVQ6DajNgls
-JL9zQ//swfiXts2Wk1pMfqDJLjstHT5V44xmhWyvg389MQ5HSvWDLeYFPODdUWFo
-7aHJHZXILFbnPWfsks7i
-=jlSC
+iQIcBAEBCAAGBQJNmg3yAAoJELHSF2kinlg4NvwP/iSiMqMOCULf83hQpNvFkhAt
+TLQ5oet3Jj9F0+qadp4LUEs9UljW7E2yHXrdhNvM23JUrfBUxaxx2z6oHtZH9+eR
+5++VVzRx/Ge2G1pHI/3Uv44H5EluPiazH4zVXpyAFJMIAoK8HxcT5/SVv4Egs+RM
+NuBTyC3ggoSPsxCSWo7YcSB9irk7+fGfbP1GnWL4PjKPkfTLk9frXQgzrBfvVuhN
+nQUexkHbHB10qcT9Dyn+d1gmWwF0xHTuCSxJ6z2CA0xdDRAbWp6WnCsT6vfuX6ya
+fRqSoZS/fOMu7rwISHhhTkROyrGzM95tifJSm5lJdNb5E9ifjg7kLIggZTnQQArv
+aLrF4L/QSzc/UiEFAcml8ZHojnWvzNS//uZ9JVABn5sAlOXXQ9b412VKAnxrFkBr
+w+LMYGnwkpng5k8KmascUy+nkGLsI7sLl+NZzWj/JlmtNP47DRPRHeOgxdNtp/1Q
+/5/ab8Gvq9HQE7TG7DkIcK7Z8lDqQwkCHY3VBGpP4tlqDVYNX5XFx+7Rxf5TENYZ
+Se7I8G2sCnyVteg2ZvvKjdR1unxyksJOC6FP08khZZw/Ru8Jab6zTpl5mQTo97uQ
+XIavCLMhtWBXD5g6Zx9l0XfNqWtJvtgR0yGDWbSiXYPXitkEXNrmxYANhBnnWCgf
+LV1T+1qqP3jEafTyGgg/
+=FDmY
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdeadmin-meta/kdeadmin-meta-4.6.2.ebuild b/kde-base/kdeadmin-meta/kdeadmin-meta-4.6.2.ebuild
index 5f19948a0a3..6c237af84a9 100644
--- a/kde-base/kdeadmin-meta/kdeadmin-meta-4.6.2.ebuild
+++ b/kde-base/kdeadmin-meta/kdeadmin-meta-4.6.2.ebuild
@@ -3,20 +3,15 @@
 # $Header: $
 
 EAPI=3
-inherit kde4-functions
+inherit kde4-meta-pkg
 
 DESCRIPTION="KDE administration tools - merge this to pull in all kdeadmin-derived packages"
-HOMEPAGE="http://www.kde.org/"
-
-LICENSE="GPL-2"
-SLOT="4.6"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="aqua cups kdeprefix"
+IUSE="cups"
 
 RDEPEND="
 	$(add_kdebase_dep kcron)
 	$(add_kdebase_dep ksystemlog)
 	$(add_kdebase_dep kuser)
 	cups? ( $(add_kdebase_dep system-config-printer-kde) )
-	$(block_other_slots)
 "
diff --git a/kde-base/kdeadmin-meta/kdeadmin-meta-4.6.9999.ebuild b/kde-base/kdeadmin-meta/kdeadmin-meta-4.6.9999.ebuild
index 671e3a316d2..0cea06772e7 100644
--- a/kde-base/kdeadmin-meta/kdeadmin-meta-4.6.9999.ebuild
+++ b/kde-base/kdeadmin-meta/kdeadmin-meta-4.6.9999.ebuild
@@ -3,20 +3,15 @@
 # $Header: $
 
 EAPI=3
-inherit kde4-functions
+inherit kde4-meta-pkg
 
 DESCRIPTION="KDE administration tools - merge this to pull in all kdeadmin-derived packages"
-HOMEPAGE="http://www.kde.org/"
-
-LICENSE="GPL-2"
-SLOT="4.6"
 KEYWORDS=""
-IUSE="aqua cups kdeprefix"
+IUSE="cups"
 
 RDEPEND="
 	$(add_kdebase_dep kcron)
 	$(add_kdebase_dep ksystemlog)
 	$(add_kdebase_dep kuser)
 	cups? ( $(add_kdebase_dep system-config-printer-kde) )
-	$(block_other_slots)
 "
diff --git a/kde-base/kdeadmin-meta/kdeadmin-meta-9999.ebuild b/kde-base/kdeadmin-meta/kdeadmin-meta-9999.ebuild
index a1cd4bbf686..0cea06772e7 100644
--- a/kde-base/kdeadmin-meta/kdeadmin-meta-9999.ebuild
+++ b/kde-base/kdeadmin-meta/kdeadmin-meta-9999.ebuild
@@ -3,20 +3,15 @@
 # $Header: $
 
 EAPI=3
-inherit kde4-functions
+inherit kde4-meta-pkg
 
 DESCRIPTION="KDE administration tools - merge this to pull in all kdeadmin-derived packages"
-HOMEPAGE="http://www.kde.org/"
-
-LICENSE="GPL-2"
-SLOT="live"
 KEYWORDS=""
-IUSE="aqua cups kdeprefix"
+IUSE="cups"
 
 RDEPEND="
 	$(add_kdebase_dep kcron)
 	$(add_kdebase_dep ksystemlog)
 	$(add_kdebase_dep kuser)
 	cups? ( $(add_kdebase_dep sys