18 files changed, 191 insertions, 63 deletions
diff --git a/dev-util/automoc/Manifest b/dev-util/automoc/Manifest
index 7a4475827c7..4f1b2e80097 100644
--- a/dev-util/automoc/Manifest
+++ b/dev-util/automoc/Manifest
@@ -1,22 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-EBUILD automoc-9999.ebuild 463 RMD160 9940084011e506ea265f3366ba9ffd640b1d9eaf SHA1 d699826e0af19498c0c793850dad90d32388d049 SHA256 20d7a41a18b5724d7aa9f5c38997e2a8c38e6b9d03660ea171b192410373c506
+EBUILD automoc-9999.ebuild 463 RMD160 323fe200a7cbb4a6ef46a7615f5fa281a194652f SHA1 80ce0565c2d74537c5dab9bf8ec4f551804cf004 SHA256 b33ff5423dc12513be43fec03ebedf9bf8cdbc98c7c5f180181a0551d91c6d49
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJNqy5WAAoJELHSF2kinlg4SIkP/1yv9NYmaYryZrDTsHJonjCW
-6dJXzktKyIzifqMSivcvkGnPYeso/vJKCGng0r7T28VI+nFO9v50g3NJUuTHUMfq
-UqE322xJXT7lbT28wYrZeEj+bcnc1pnyEVaB7Jwr3DGsEeQFwXGu80ukce11SEit
-Xda6EjmaNee6k5bnxjKekJSnHbH1mSoQVAfmmOPh6gwB3sN49df5UpE7BvXx0WsB
-0ij/XETp1vkE4sfiNnQgZz4M0Pv54TAfN14bMgpd+X9VOGsfMPq1sXem0hBCP5et
-m1Nv4qXidOY24eZ8/MW9AM+OR5GfYE8YjCtnfAUcnoBlwJkjJn6BHsFde9zYbJr/
-YzakkMYP0aOg7NeZmxxfo+M62QbnkwYY9r5HEqcfAkJtTtJ30I23QTz3Opp0B54H
-hdja4c1HJGnyNB2qXrKeAf++a5bjrmutOMPcTanvQZFZtyKO7G2/z44xo9M+49o5
-RjeMiYJIXxgm2WSCyVvLiW7YN2FmX1bXfV1je8nLo9ep5HbsrPYcJwrcWhefaIw7
-5VhPWRo7UR9RSB9+oH9o9Tp7SJ+iyyKqRB786C+WA1Dvj6RQ+J2YvFZYua6LWMzY
-MArUNYNg64a5rC3RQiCdAcS7x8S6Vi4iU/QB0LU7ND3NoSpwgSZuD3Zl7dp7PqJP
-RgLOF0Fb3AftTgNSEfJD
-=LWhJ
+iQIcBAEBCAAGBQJNuMhdAAoJELHSF2kinlg4L3kP/0qpvOm8T9k3Z7ODbSoEnmLg
+7mB2s0l4TuLA31UFl+cyW7xuPED5ltxGMj8FjU90KA6Z0jKKZvlC/jNrTFRh7lSy
+m9VlhkA1HepQX4u5OPJzOyrERaAo3xdzwGbo5Hsx4P7rppcgMIHi04bbJBX0t0eH
+hny+jBKudlphiDDLWrQ8e6v848wIHAPItNDCKVsn7WJpB7rq1d36bW47TiqZv+9C
+aFTzE9QobnhNJ7NJreLyv2GFnHJ4RhyJNqETK8NLP+p94aa54M9iy/DY+DiAks9p
+MUOzTVVqh3s6pUtGwyT6F7NG8SNu4fzNUYgEyrM1kaYafxZEVu6RRaZlVq/arJxB
+hz1N+LLS/ff2uCOQMOi76glbn+I2GQNwx0y1C4/o6G0QcAjSAG1R4KPhU9khHaLO
+VrQ88NKPcZKL8ccloe+GBbP85lFLAjnBfOEo+FK8zSZ5Mj5MmxQ9vAqv0XjRlJ8h
+zwhEebD8mIietVjMZoD9vTBTQpujvZymzRs4MRcK6163pj4+r54gvFY7tO7igG2t
+/JrpmFRd+D21hvWU/lFw4HDiNA2aJ2Mnh2bPCnNCYYb0Za4fYKW6ie12ejzfYZFr
+XFjeAVXhBPFioLW7lMgER4TEyQa20d5pnfuUXojCTP6w244Ia1WMNKaMm2foxOxg
+2xxu20LiWyBT0OPeB9Yx
+=XVPy
 -----END PGP SIGNATURE-----
diff --git a/dev-util/automoc/automoc-9999.ebuild b/dev-util/automoc/automoc-9999.ebuild
index 979bb1fe835..69ae8ff8ae1 100644
--- a/dev-util/automoc/automoc-9999.ebuild
+++ b/dev-util/automoc/automoc-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit cmake-utils flag-o-matic git-2
 
diff --git a/dev-util/cpp-dependency-analyzer/Manifest b/dev-util/cpp-dependency-analyzer/Manifest
index 34722bc17f8..9975f5470c4 100644
--- a/dev-util/cpp-dependency-analyzer/Manifest
+++ b/dev-util/cpp-dependency-analyzer/Manifest
@@ -1,2 +1,22 @@
-EBUILD cpp-dependency-analyzer-9999.ebuild 547 RMD160 83cc5f18da5b7601f3061d60cdc9b48004c6e464 SHA1 2064a0e635a37259169fdc09d5b94f5e59873c3d SHA256 3eed73f2657494daa6d52cff18f6c2862a13c9f493f47d4d9d0bb43ab6a1379a
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+EBUILD cpp-dependency-analyzer-9999.ebuild 515 RMD160 dea6bfb6cd65873045a49f3516e379bdd11bd80e SHA1 fe782161b36187c86867a36e3acde49a8fbcdb16 SHA256 cc9b3d8421ae902ee71b75b0261020b2d1ad083d7a73f89938952b627fc55eb1
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCAAGBQJNuMhaAAoJELHSF2kinlg4TWwP/RSQAC8UL4X2VoB/dClMG9/K
+HPGUG5+aT4ws8akxX6JlaXu918XkRX+84taS+fJMtMAhUpWJnzlKBCjX04wcrvER
+unTWn7wrS98e1xBMtSffA3NiimJo6yJE9WZpj2k6pTEyIeaSydOIcI+SD5pGrufg
+87+K6yfX4mCqgfC/O4P7jQ8WyocrOf6aKIh7rNChET++UzAXaIe/Qt7ln2mqPltN
+S9SiQyFzIXMF5cWdZMby9/1Vcm+pAVRx8kdDc1b4SaOZWYwxCGZP/W/seMrQ1/Zq
+uB2cLNYG0MOxjLl2HzkjWGC2Ny7hJ8/20qJxQ5KSajYO9lGTWHjyXS/GRCIB6es0
+tMYeyvo3TxVqvtn6n1Xm9DGsHjq6TEtjhezJJOkclwCsollvODiM8MdKUpxfTeP6
+94cEPAMcrAVwuHKc7qMmyp8/PU3C+//6cxIjLzqSAuDVKswVCyUzlSQTTGRPXqgR
+Rn+1+eKukMQZoPZ+W2rN0t2bcrh2mMzVMjd0FEXW+3uTzGXGUFjy4UVxrh8lCbQB
+b5E9n74dffUeltHQQQdayrfE8T2zftyh1CRAYAmIu+mK+zVho6pP5gvZ7QmS7dDs
+OzRwzaoTt7q2Ws8dOYHvJkWeqz5ATSlzvYpDbFbyWKLpuQC9y21vc68fmm05Mulc
+yIh0HZMjunEfXOH/ef6E
+=oN9P
+-----END PGP SIGNATURE-----
diff --git a/dev-util/cpp-dependency-analyzer/cpp-dependency-analyzer-9999.ebuild b/dev-util/cpp-dependency-analyzer/cpp-dependency-analyzer-9999.ebuild
index 55f04270fde..d19c8432a26 100644
--- a/dev-util/cpp-dependency-analyzer/cpp-dependency-analyzer-9999.ebuild
+++ b/dev-util/cpp-dependency-analyzer/cpp-dependency-analyzer-9999.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
-inherit git cmake-utils
+inherit git-2 cmake-utils
 
 DESCRIPTION="Tool that creates dependency graph of C++ code"
 HOMEPAGE="http://gitorious.org/cpp-dependency-analyzer/"
@@ -24,7 +24,3 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	>=dev-libs/boost-1.35.0
 "
-
-src_unpack() {
-	git_src_unpack
-}
diff --git a/dev-util/kdevelop-mercurial/Manifest b/dev-util/kdevelop-mercurial/Manifest
index 9c1b1d145a6..cc9736c533d 100644
--- a/dev-util/kdevelop-mercurial/Manifest
+++ b/dev-util/kdevelop-mercurial/Manifest
@@ -1,2 +1,22 @@
-EBUILD kdevelop-mercurial-9999.ebuild 569 RMD160 a32ad95725d9b01482fbff1dfffb8e6a23710111 SHA1 e5221fe5fffec4685f56ff557b1605d758087f76 SHA256 1702d7b78c294c36e3e4d3a0b6e391b02ff4b817bd92d7be8911c3ed2a0e9d3a
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+EBUILD kdevelop-mercurial-9999.ebuild 517 RMD160 f612d2789be61a69a9d3a5b1ecf4285f2d913545 SHA1 7a2f790ac46545d3e4ed571ed183eec9b050592d SHA256 266a3bbf99235141cf03e9c36224c374a1e154cffd43194c9a976188e101407f
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCAAGBQJNuMhYAAoJELHSF2kinlg45+AQAIhiAdXtSJqOLzX5lF8kRHSr
+cma6mneqbJ7BPBjbF7ANXussI6xMtZK8pktXYj04PlHcGPstuWeT/kEfGREb2ht5
+BoTy7KSGlCftrV22EXhZg6ofVmG3vp1ehLRQcjde30tVwHj48r2v6tv6HI+GKn9a
+ft3mzzx9OF8ooNxyWuPrYt64BodSQnhBp8dcWmCZhRq68J+GolKP26L/Z/rn6T+v
+DjVHrdkK3QhqP+RqClFql5ahjWq45du4XGmgnlqUxLcel4faaILwWDCDl2tSbqGk
+syrLL0gjr1XkXFOhGWigxfwkisvxdQeGNYw8U0ShKLIXi1E3hBFaPRjXbk5wmutn
+s4WxWdOBMg0JvEUbe6P+3dLsFW49Ma8KxgeMsWOHbcVBDlkcBodp3bRcV/rixdwN
+id4i43cOKaZkZaXp4aYcwy5x/7PGSQ/5Gle7tAmWFqtIjfmfIYQwa89aK8lFF6YA
+6FQWHyZxhcMNpgq9LnkFrCc6MH67c8xQIgO4o1Eiq9RLHEiZIGCAjQXmbn+Bft0e
+PeXyi+2JYUahoopPKnl8b65Q4mHEWow9Xt2L6j1J8V2wTkG/VtSbGv/izJ361vSb
+6Cw4DlXUtlB+Z1vD+QiKI794GZoyFkU1l9+5BSwD9PMfurW7Y3v32KACmggywzaz
+O4TWV0eTTWbcwTqrPDjX
+=QXK1
+-----END PGP SIGNATURE-----
diff --git a/dev-util/kdevelop-mercurial/kdevelop-mercurial-9999.ebuild b/dev-util/kdevelop-mercurial/kdevelop-mercurial-9999.ebuild
index e01b436444e..bec6d7675ad 100644
--- a/dev-util/kdevelop-mercurial/kdevelop-mercurial-9999.ebuild
+++ b/dev-util/kdevelop-mercurial/kdevelop-mercurial-9999.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KMNAME="kdevelop"
 KDEVPLATFORM_VERSION="1.0.2"
-inherit subversion kde4-base
+inherit kde4-base
 
 DESCRIPTION="Mercurial plugin for KDevelop 4"
 HOMEPAGE="http://websvn.kde.org/trunk/playground/devtools/kdevelop4-extra-plugins/mercurial/"
@@ -19,7 +19,3 @@ IUSE="debug"
 RDEPEND="
 	dev-vcs/mercurial
 "
-
-src_unpack() {
-	subversion_src_unpack
-}
diff --git a/dev-util/kdevelop-pg-qt/Manifest b/dev-util/kdevelop-pg-qt/Manifest
index 0ad960cb28d..30587ccae06 100644
--- a/dev-util/kdevelop-pg-qt/Manifest
+++ b/dev-util/kdevelop-pg-qt/Manifest
@@ -1,2 +1,22 @@
-EBUILD kdevelop-pg-qt-9999.ebuild 385 RMD160 ff372d8dd6843eebafd30f1cba76dd082a9c5c12 SHA1 cdbdb23b4974b0513893d48d71300bff698e1a99 SHA256 ecef0c29f496c6d46da3a2a3de3421a1649278f408d12b5b0824afdaca52f89d
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+EBUILD kdevelop-pg-qt-9999.ebuild 385 RMD160 ec755b713b09ce18db873bf19f98064e64b4c209 SHA1 52b568f8b2cfe652e1edc8762f8d58fad32ebb80 SHA256 fbe76b0087a174c9d412f9249b0f98553e61ca6ec7babce30f9a61fd0460f7f3
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCAAGBQJNuMhcAAoJELHSF2kinlg4F3gQAIAoECadmU9NuH0O/Hd3BPqh
+XMdfqmIsEzpAhy7vDzD97ZqxhDK/j9THCACvsGzt0p9B+SLrDebTEx9/7DJqR/C1
+UmN9ogmafYPTaqPMdm7Mv6tpImhxel3FHCdCRkkjJnDG/pC5+4df7+bCaCNd8nUs
+WZYOcsMzEVQVVhK16EoF8DraupXXg82BNEw8hLeFocMSe77czZk8s5o29fpSxqgH
+fm7GecUgx9R8kMPVCK7gtf/4H/j+oBSSWTkrIuq8AtpF46DNGB1Nu6QiXWc2tMMM
+yLMg2QpruRsSYYDN9t/ekYBj+ygskMU06A1LQqzZNrc4gA0wBYewOAMb6WguTmAF
+3nzY5o0dY2QRrwsZK7zEay4vQGEpzGoCLt7VfWenATJ4y4dTEuwsD3YGaUD421UI
+QxcqqIniSSQ4X8dz0Y/qZXFZKBD1L+/I3Q5cd6FRKDnMjB3Twh/NrGwZgcD5I9Qr
+w3bViMDm0fU2tIoWJIaSUYD/rzy9N+ZZJ/IhdfJxrQKldWhAlyIevu+zYVhyC4HN
+w4Ogx1w7P8CQWQTStDVDxflfgzSckOssP5BPx7EF2VRDaxiYbnctupvoNy6U4Rrb
+yIJ6NuMTUEqtQOuGPjnsPzW7nNu3dfR/AseN7jyfU/2M6j6ETdEVm1LECWqMB4MZ
+upmRVZ+v5qLOQvtOCii3
+=Px2E
+-----END PGP SIGNATURE-----
diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-9999.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-9999.ebuild
index 6818f375538..0c832440d6d 100644
--- a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-9999.ebuild
+++ b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KDE_SCM="git"
 inherit kde4-base
diff --git a/dev-util/kdevelop-php-docs/Manifest b/dev-util/kdevelop-php-docs/Manifest
index 118b991d650..11c131bddaa 100644
--- a/dev-util/kdevelop-php-docs/Manifest
+++ b/dev-util/kdevelop-php-docs/Manifest
@@ -1,2 +1,22 @@
-EBUILD kdevelop-php-docs-9999.ebuild 361 RMD160 e81afe3b2c588b50db7675de4480dddf32fd202d SHA1 ed4b7ae9e044c4f56d54fd0b7e1efe00a198f8c0 SHA256 72ed7647c9cf27f8605cabec34c4eadf78fb6c154946f3bdb82f98788eb9131b
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+EBUILD kdevelop-php-docs-9999.ebuild 361 RMD160 60c52ca1ffe5ab4273ad0e39f5be9e8369ed8420 SHA1 2e55e99d875bb191f8afc55bf46fc5e196396039 SHA256 941ed6317b1291b45483789bdcbeddafba287aa5db0d5e1980d03eca6ef4db9c
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCAAGBQJNuMhXAAoJELHSF2kinlg4g78P/jve7xm9cZqD+pfmawIE63KB
+HSCUGFLJV2fO5lttPXpFwWsikUMzzFtVD7T49boLF3wnu1U123usDglJmZR5Ue2B
+spOhuJfIQLobvA8UryqYnqVxHgPLv3BV5FRMgXSlzfkKx8OBroz1p9Yu6DddkxHu
+5JKsbPcc0L59WrLWsdx7ysy+D55vGl4/DdBCIZOUq2jHT8gb0SIb/NCEi799MKke
+tizVtP/6ZMkxgjYo3y97lwPY/kCxAOcWCO8Sxc2DLrWKq/SL2WHJrWY94G3wbSxW
+FwuJ6HzAzZRWnGq2pjtclxam1x8k4WIniX57Z0UpRjQ6ACaGTAMJdty7iRnCW8PO
+/dY1FbxewCe6ia2mMQsbKNXf9v0rWs9PMkcgTFtQvOG26Yzuwe3dMMZstyJqJwVf
+NP50WnTI5a33uz9papfM14Ti5crpdNtLEE+sHn/WQXoVyJ1vkxuhWG1fpqp8ghWZ
+xzc82bKcTwaum9Wfhfw6Q4nA6vMA1GX7SVaTOH8RDGsJHQrS/8eYFUAF0XTpJmk/
+AOknQaBxoEtMxb4REJvvuJVeLjetso7dyJVhLhuh7XRqXpwsg+Uoe2/oj+FMzaKE
+n2hwMjzsBAzuFcH4eHVBgQPd1/9cxdSfvpZypYq5P27ywt2siUfIa12FprtEv5h7
+f3ZqvCaguswmNdSRfKp1
+=KjhD
+-----END PGP SIGNATURE-----
diff --git a/dev-util/kdevelop-php-docs/kdevelop-php-docs-9999.ebuild b/dev-util/kdevelop-php-docs/kdevelop-php-docs-9999.ebuild
index 3b4c49429bd..6c4c78d27d6 100644
--- a/dev-util/kdevelop-php-docs/kdevelop-php-docs-9999.ebuild
+++ b/dev-util/kdevelop-php-docs/kdevelop-php-docs-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KMNAME="kdevelop"
 KDE_SCM="git"
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index 606d8c4a000..eca1401c1e8 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,22 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-EBUILD kdevelop-php-9999.ebuild 427 RMD160 e90c85603a0fcb1c9349dc16ed0f94dac4769bb6 SHA1 523ba8140b0000472684417108ca3ae4cfbc8bc0 SHA256 37fe1b6117ae3cee780eabe468bccb87d895f6a99f2623966f904ad9f90d61f2
+EBUILD kdevelop-php-9999.ebuild 427 RMD160 7af68e61cfab19a05733275d3995034409d7c2b3 SHA1 2cbc8e01b77f5f5695f577cec45bf548e4ce3332 SHA256 1507441a64ecf858d1f60edbdaff17b1146b0286dbd49e479ce8691cc8b2c63a
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNpMl4AAoJENwGBM22xffe0+EP/0Qa73e8Q+ViVCvQM06Ra+I7
-zOUxGJRhe1b6Ct+93eeDjkjEnzTItbpQQnWe4KTWKZonqxT8GclxHTCFNQdoi0Bz
-iSpwv4RPybuWMKg+WDQnSXJNnPfLvSQJJG6bgStrYcpbvZ8hyLjKMt3gBOIQ0wHu
-k6dSVvtCUvrra2ELcIGpEp0iMjjj7cz5CMwNEclNd3hDRjOUS0EbfhE5Mj+F2cyd
-A+zn9H3wWfa9Re2rvKHj+EwXJQuH644+Ym4XlK5Ca6pgOY0rkE56oW5Fk2ehl15g
-AYTJeMAEub6xP6ZzKn328td0B7tvASPumtmMyW8JD2bdI5gkc7wxLPlSuGZ4BriZ
-gQ1mo50ipDaejM0wcu4ga6W3sYJetRlEOqv4ACMILvVUYBW9rNZ2/WABvrYuUy6B
-jnsFJhB+Pbw6pC1mA6jOBzlVwDIBwmPbFYPv/grf+Y0W0av+DJ9yG1O8+YM0fSX1
-QV5WHMSB3nP/3/qhsRjk+y4h4ntGjYhJuhbX8zEjQeG4B3u6g53+W2FjqO1oCXdZ
-XKzC8rsMUeYu+4cKCyvxz/9pahoqANQoBSTK4Ogmbe7+pmcVov23ArzC8uWGM2vl
-8wfCMZ8Rz0KdtQnsVHdBIqsWn/uLevcuCuC0d+efrMhmdu90/ApWx6/w2siBdagB
-SSK4nZ4EDGu3P5Svgv+5
-=1JSQ
+iQIcBAEBCAAGBQJNuMhdAAoJELHSF2kinlg47VgQAIKHSrQx+AORiTqeG0Ogy0mW
+UOxGblryqkYrOfcmC/bjJLyhNbOkkCFeZclUzJEr2unN4s8+KyiQxykXXsWh2Vys
+LaZoXosHUWZZ9Y3p3QSx/Ml5ImVKhwJ+nUS4nEM1kYPLJRj3xtUvrDkfPhOhwrK/
+9Ejhb55OyLHkxtYs3VAtiIEHk1tAsVImnR9X8ErGSt5FdImx1sfGBRSQqPGn3arm
+0/NA8/yPGWFq2pYRQXslN9Ql9DGn3E2TiVVsKiTDqUgexFmuFmN1Qdiyb33yQFLB
+tGLrHUy27fDI+7xC8jQuAFmgqOo8IjZYMnWJssFEVZ/5vgoHz8QBDDBK+oAZqkRR
+KQTY7b+TM/h/lSaoIANvwnQ5wsFAsr3HNkLfIiObymCcmT/IQT1c2e+uIVPSq038
+WWHm7BEOR0JpTy442wnQQGzl8Y7Mc8VFAp5DV2rIr7VM9dYtqG+gEw62YFyqSQBM
+WG5jFguYg6vXrmFtSu+Na4I7/hDJs9k7d+GlaHfd+Sr7Bf3kFy5pAIhKC6HK3+P8
+MoXcYuk//d5VJ5MCpF7X6Cw+xARqtAh+zfOdCqXW0CR5NmFaG4nJJIwWp9GqvjBV
+JAz6K+hfnaCW+y8z2QvW+53IHgTF9TCec8vQY9VRQ+sj5wew/nTbnisEHvV791b+
+/NRDsyjKQlXT6+8UzWjq
+=D8/i
 -----END PGP SIGNATURE-----
diff --git a/dev-util/kdevelop-php/kdevelop-php-9999.ebuild b/dev-util/kdevelop-php/kdevelop-php-9999.ebuild
index 1af24c42aaf..f43c00ef882 100644
--- a/dev-util/kdevelop-php/kdevelop-php-9999.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KMNAME="kdevelop"
 KDE_SCM="git"
diff --git a/dev-util/kdevplatform/Manifest b/dev-util/kdevplatform/Manifest
index da0d13b9822..c9f07a6f024 100644
--- a/dev-util/kdevplatform/Manifest
+++ b/dev-util/kdevplatform/Manifest
@@ -1,2 +1,22 @@
-EBUILD kdevplatform-9999.ebuild 1632 RMD160 a8cececc75adeded1094b10df8a9e11d4d976624 SHA1 f7189592657e8088a4dc76b5c2b436b89b34c1a8 SHA256 eb5d1fddfb045adc361bdbd6e2586250a7b41de8cd1f850248f1cba690be9a32
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+EBUILD kdevplatform-9999.ebuild 1625 RMD160 07578688dedc4949339a5aba92ebafae99c2b2ff SHA1 4f8d90e2702ff505df0141f583457cd826cef0aa SHA256 2cfaccf517059b569483775cc9c9b9ffcd1369b1f1b78065702ddad4f33b500e
 MISC metadata.xml 289 RMD160 5df6ca559e1302043ad23456aedb09fcacd7acd7 SHA1 9f26aa927ee5c2209fcb3684bf00023c5aa4dada SHA256 88e0f5b61bd48a62ee51897ec303a9098be25268904c2d63185531ee1a412b3b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCAAGBQJNuMhfAAoJELHSF2kinlg4kb4QALCNCCabQdRR5aRJc4yXydLN
+v7BALnFaL0nJULmVpIo0CCDUc6PjxypWDMm42uZ9TIjPrjInMBaL7ybzI9hhHfHP
+0vATxecGtIXz3NOvQnkkRJwcXGZLbIcBVaMuCoctw14+yyDKlZ24N6SlTh5opVaa
+GERcMatKcYyuIWWYTwqOyisNJGY7PwPzkXVQmn4rAXSllmkmgKX2copAEnFTOkKe
+XLph0uuOaN5JwwskmU493wpAiQSeM87ao/0cnty5lbv6r52QIcTrwyrWfTr8FUVj
+yEn8X41FCE2Q6QPxN+ejZzEvAKtHyt1H/90dCMS0cnNksSCBae5vBrkEX5cOWZJ8
+/davzhhPqs9piXugxJwm7Xr7DDyD2YtnjJHYjcCzFvUWwm7xyuPAEDr82G67tbGC
+r8lLRo5wntPHzz0hbKIR9ESj4oL4WnO0UHEYte6fOgHVVW+uFP45xugH0s11PZD9
+EcsHBX6wyT/wE073+qlnjuqE60TptUIu0L2I894lTrfq2bVW4BL7AePraiktx9iE
+1CPKPieUgdBUS8Jm2JWY0vbyNh+s8ejsUDwka4+0XpuFOL4lifwYHobHkqD59x5Y
+STiO+RW7FGo+NPtcfnZSzVywR8i/0Vxdo3VyOL5+R+8yIbRzsflKboylsyvRE/sl
+JlGUCnUjsb6vVrhJ5n5I
+=1j68
+-----END PGP SIGNATURE-----
diff --git a/dev-util/kdevplatform/kdevplatform-9999.ebuild b/dev-util/kdevplatform/kdevplatform-9999.ebuild
index 55bdfcf6c7a..d3bcba08a47 100644
--- a/dev-util/kdevplatform/kdevplatform-9999.ebuild
+++ b/dev-util/kdevplatform/kdevplatform-9999.ebuild
@@ -22,7 +22,7 @@ IUSE="cvs debug git reviewboard subversion"
 
 # Moved to playground for now
 # bazaar? ( dev-vcs/bzr )
-# kompare? ( >=kde-base/kompare-${KDE_MINIMAL} )
+# kompare? ( $(add_kdebase_dep kompare) )
 # mercurial? ( dev-vcs/mercurial )
 # block - some plugins moved to kdevplatform from kdevelop
 DEPEND="
diff --git a/dev-util/krazy2/Manifest b/dev-util/krazy2/Manifest
index 4b625aff178..bf33097fe5b 100644
--- a/dev-util/krazy2/Manifest
+++ b/dev-util/krazy2/Manifest
@@ -1,2 +1,22 @@
-EBUILD krazy2-9999.ebuild 1308 RMD160 cf3108c73ffebc68f437dfe1a95e5155c06af4e0 SHA1 32608181bae3d73b84869493bac42c6c73b1a20e SHA256 68c17d6a46ad611d0323a8f222857831cfb6ed5117de86a91073d9f43dd7f91b
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+EBUILD krazy2-9999.ebuild 1190 RMD160 0bcfd59078980d4f8a32de643e00952174bcfd45 SHA1 88f082a3a7fb98424b440badbfddc6f9b4043785 SHA256 e37ca14ad88a1049b29801d26ac4e16e2133a171884226edee7e9265ad322c07
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCAAGBQJNuMhYAAoJELHSF2kinlg4kxkP/1BeZbBCBykAPbgkO4QlFDDi
+nnZ7AAYmlU9bIrqlVx/P8NWJsK7DFnLBmf/3LsPLhes1X3aYw8RQsJGGz1+b0PS8
+Gebdtt6aM8REFWQoaEUBK7c6DZXSVTOwASvTimQw2yYHeJ+gBWoXhXVeaTWd0olO
+ERdNZbwhTqlWQsfXcWXSt0wFNSVcsbBmTjz/4wlvCRKCNC31uZ1cVluW6YlVgpwf
+0TF72y8z2NDu4fofHxez4FoQ+lQG1vo+99wS50pYsrBJbf3jgshyywjhy2G58yXi
+ZphDOajCvUxawv0IjgOeWbQKeGPlU9bLVGK0JLusoyq3AAZQ+MAEPbR62wbihnbc
+7880X979WmhciVGEziMFfL0EntM50zTKTbAdkwBR+ucEzjXC6ttMmJm+3VdqmRZN
+GmABsLdVbL0aa0ci0R+8qzV2Jgt4ztyedXnIV9ZM/q0MgOVFqn4J8V5QKJBYJYuC
+kSX7JkiIcRdHYRZgM55w4erGiBn0g4tDHZHDLUU1rjOabwtjTJizkmOtQfuNrsTe
+bF/r0KsH+7BlYjpdAs+FKTCeuIBCyM6O6gVUTarbfpHHJ9RspvFnDW/p3Ew+Mysr
+fKxAd5evEDyNfYeohjVXlGz9Kpx2Q0bNyeTwSNfCBgLcDVohic6onMe/upg2siq5
+/+lvYmSZcbD5Baj8PqUT
+=YsPc
+-----END PGP SIGNATURE-----
diff --git a/dev-util/krazy2/krazy2-9999.ebuild b/dev-util/krazy2/krazy2-9999.ebuild
index a2f22e39fb8..16e1651498f 100644
--- a/dev-util/krazy2/krazy2-9999.ebuild
+++ b/dev-util/krazy2/krazy2-9999.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
-inherit git perl-module qt4 cmake-utils
+inherit perl-module qt4 cmake-utils git-2
 
 DESCRIPTION="Source code sanity checker for KDE developers."
 HOMEPAGE="http://www.kde.org/"
@@ -28,10 +28,6 @@ RDEPEND="${DEPEND}
 
 CMAKE_USE_DIR="${S}/cppchecks"
 
-src_unpack() {
-	git_src_unpack
-}
-
 src_prepare() {
 	sed -i -e 's/+= ordered/+= ordered nostrip/' \
 		src/src.pro || die "failed to apply nostrip"
@@ -52,16 +48,16 @@ src_configure() {
 src_compile() {
 	cmake-utils_src_compile
 	cd src
-	emake "$@" || die "2nd Make failed!"
+	emake
 }
 
 src_install() {
-	dodoc README TODO || die "dodoc failed"
+	dodoc README TODO
 
 	cmake-utils_src_install
 
 	cd src
-	emake install INSTALL_ROOT="${D}/usr" || die "Make src install failed"
+	emake install INSTALL_ROOT="${D}/usr"
 	cd ..
 
 	./install.sh "${D}/usr" || die "install failed"
diff --git a/dev-util/kxsldbg/Manifest b/dev-util/kxsldbg/Manifest
index 869f0c63177..fc42d6f0f49 100644
--- a/dev-util/kxsldbg/Manifest
+++ b/dev-util/kxsldbg/Manifest
@@ -1,2 +1,22 @@
-EBUILD kxsldbg-9999.ebuild 591 RMD160 ea668bfcc6f9f3a594a53d8f1d29a3bca7eae5a8 SHA1 e296412e14236fe1a5a395986ae78906411e586f SHA256 fe5f706ebef5aca6a7b9a5254a7450c4444ea487df505faf25737befb982968e
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+EBUILD kxsldbg-9999.ebuild 591 RMD160 7d9308901d80a8012395829616143ed38a5933d2 SHA1 c702fc9570321f1e7f6fdd58620d46f1c35abb46 SHA256 64559b0009e980eb2f7007ca08e2b6c3235c6a62ef52731c90953a5826b82caa
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCAAGBQJNuMhjAAoJELHSF2kinlg46gwP/iXzvqb/sFtsEdxVayWaSw3q
+4REyxiw8MZd9ypgbZYX76L7Ropz0kl0rzrIU9CRSgaQ9nI/qVWYVOnqHESeMtWH4
+Ltl3Z7MYaUq6g6mp+4tzWMMW/JWnizaDpp3WvIu76wB6IE8vMRvpaz4+PxBjPEP8
+3gG7O2nWNTXjvkDxfFLbuXoMhyt3N+GDkaffrJePY13kXES4NunFnxrYEKapHNpF
+rxZ6wEJyM6oYB7Y2SvTfBT28hrCKJ5URNn8PJffLfS//8UYur6a/PlMVJn+pi9cU
+QjZm2k0LuWlq9TvocYnTO80q4/B+dODuis09Zv22i6nukApznVQ8KCcqBH2mcRWQ
+w0KtYLXg7kd8hRcmHGwIe+UQ0Xbrfs75+VOXOJdUlg2sDWHgBveGR9vi0nk8cyUQ
+VsQstQYB4c7qTotUC4JaGWRSFuZm9MsImpyAU4IR/wuik8eu01k/IOFJEh1WrONM
+ms2eVcEPv+hZUNIKmoHUpO0Ok765s6eG19wXN36SoLOMmk3M5wDaarLUnFCo74Cb
+CcRzsJyz7lSHuj0+NLgruw6ABl0PPJpCDcD943jeHQPZrlo5ZJFQyVWMVNG53ea0
+DTiwJNLNZ7aTBSeG+hj1pnZrRImQQrnUo+KlWQ7sZfmeFIWwwacZYfh3JN2yg7yL
+QQS5VAx6i8NkjL9fB6YU
+=qBTJ
+-----END PGP SIGNATURE-----
diff --git a/dev-util/kxsldbg/kxsldbg-9999.ebuild b/dev-util/kxsldbg/kxsldbg-9999.ebuild
index 7b84a33fa68..f60ceca827e 100644
--- a/dev-util/kxsldbg/kxsldbg-9999.ebuild
+++ b/dev-util/kxsldbg/kxsldbg-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KMNAME="extragear/sdk"
 inherit kde4-meta