4 files changed, 41 insertions, 24 deletions
diff --git a/sys-auth/polkit-kde-agent/Manifest b/sys-auth/polkit-kde-agent/Manifest
index e3ebf426cf4..4bbba610f89 100644
--- a/sys-auth/polkit-kde-agent/Manifest
+++ b/sys-auth/polkit-kde-agent/Manifest
@@ -1,2 +1,22 @@
-EBUILD polkit-kde-agent-9999.ebuild 623 RMD160 cc4f527dbd757efd9ac97e161f69672dd28c3456 SHA1 f104a1ebe9f022e94207c118a2b91212e4ebb5a2 SHA256 ecdc458492a41a33d58992154bdfa5f019cb7f7bcc4960dd22f47ee2b2115472
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+EBUILD polkit-kde-agent-9999.ebuild 623 RMD160 397628c6bf224f2c5eaa0a3324030d15de627aa2 SHA1 9f2e80fcd232a093b08a1d3625f9e3410f1b64d9 SHA256 9eee6527c5242d768095f81e61ad8a7a46264997770323593f9400f0c5f176c8
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCAAGBQJNqy5WAAoJELHSF2kinlg4wwMP/AoY2B/l1DFb9OIhnKROtNak
+tzCAqTqwbCLw4Vb/LSjj9M8bBkIYTFYJYOkzxmTnxTpIZ/VNirdF8mBJHgKgfOrk
+veyUsAtT/UidYHoz97zkvTfWe1+F3us0VoA4jxqT62RuOJjp6mYSTaGu0mGdgsXr
+JlWIMo3ZJ7Z49CmyZjITGiloYzlAcAL1IWcI8GJrBc4CdzXiHtWjINY99dgpkouK
+sViYaFQFi5WR6t6H0KX2uSqYQB+8RhmW+pert28PQveSGyedqzm1nP4G24x3J3+C
+CqGckQU5OWEtkM/SFp929LszQ5ate1Z5uCno47w4TMKjVRcIJq5d/Ad8Qjiq3AZ5
+5CI/btxrcN95JyvOS0wo+LVAt/SrszAGwkATD81yaySfisAA953q+CoU35SB47Ru
+npT+oR9poqNmLSA2mgbe7dpAmwjkZiUm/lgSuo7g8gznwWh1CB5rA3KL27Iy4Shg
+EqTlZujDwMFkY5/YaLTrgA5PDPZGaENh390MbzGBKOrmS+/e6x44ESEvQBL19P1m
+oyGl5WlH74zV/pVoeyBfT1G2HmvxnDBNf2L3xLm2Il1/jmAcTf3v2XWRGEmhjRi3
+JuZzN1hmCFkdOjp0I2xfMhnFW4Asex+RbvxkpDAHXbCUJY9JAZ1JyX3MPZKBpvLY
+dm/cKsOmFE92OoLfToOF
+=cF1p
+-----END PGP SIGNATURE-----
diff --git a/sys-auth/polkit-kde-agent/polkit-kde-agent-9999.ebuild b/sys-auth/polkit-kde-agent/polkit-kde-agent-9999.ebuild
index 5fd108bb192..af649c69505 100644
--- a/sys-auth/polkit-kde-agent/polkit-kde-agent-9999.ebuild
+++ b/sys-auth/polkit-kde-agent/polkit-kde-agent-9999.ebuild
@@ -5,8 +5,9 @@
 EAPI=3
 
 KDE_LINGUAS="da en_GB et gl lt nl pt pt_BR sk sv uk zh_TW"
-MY_P="${P/kde/kde-1}"
-EGIT_REPONAME="polkit-kde-agent-1"
+MY_PN=${PN}-1
+MY_P=${MY_PN}-${PV}
+EGIT_REPONAME=${MY_PN}
 KDE_SCM="git"
 inherit kde4-base
 
diff --git a/sys-auth/polkit-qt/Manifest b/sys-auth/polkit-qt/Manifest
index 22b522c3156..6ccbad3d69c 100644
--- a/sys-auth/polkit-qt/Manifest
+++ b/sys-auth/polkit-qt/Manifest
@@ -1,22 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-EBUILD polkit-qt-9999.ebuild 753 RMD160 431885cf0b82f06067a91c6154cccb09e824ae4d SHA1 20b503184ec4c60657868914a5df0c645e6b562f SHA256 998ac48992742940e68c9705cdf57680914dbf567b10a3ee7fe92b652e00e372
+EBUILD polkit-qt-9999.ebuild 721 RMD160 4ed3b4d4cf727670d791ca70b2e0d900c5e9cfca SHA1 d6e0dab2771f80dc97c3a26d4ce0d31abbb803c7 SHA256 a735632cf99b93cac42a8d993ed7c47b8ec1a015025a5ae9507b9472337ab5de
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNRG14AAoJENwGBM22xffeC3kP/04RcfJ2V9WaJeAzqPtci/zF
-aZHXzyWP4kLc7GYC+RDtki1N4xwofvzg7vLaUMhL2P6Tg6EDqdxoEIhc6Ju8+ruw
-szAOGE3fABYrbsOz/6aCoDZvC/CLUQk7PIRlHtB9kYSJk/E/3FkrlpnZmySJXAOi
-wGp8FIThotk/d6dMIuRRYz1twIiIPSzZaCKxt2d/9s4dQug3cdNwdTTBpZAEbR7B
-gq84rldm84KwNaZotc7hJi67amHP7/3rKO1KXIPJnBqJDqJ0PiR8SWZt0XdulUtj
-eh+xNW6X6mJi5B/6cGRAdn/kGiu3/U0jP4B5zMPEO8jJ8wWOzFjUV2M8tRm1o5wb
-pOwTMNHT5wt2bEd9CjRsClxfHyhon7aTs7mwm/LsT6eKxMeDZ8aDfpd/4KEmwNMm
-3YAiLr9kfz/cEfFj+PINQRQ6z2Kpyln+nA4Nihomo0zXtQXc2/scARtZaBBWBRnF
-6yjQJwPkkRjecIq9L15jfBcP2E2z+SXugmP0BDuJHSsR00DUnlCHOa8PQ8kSXGcC
-tbmjSRq1IgKqtq8tIJsCe3VLMNj+70OkmO/tz+FSdHrdgQWiGvV5BnwPDk5CSxR1
-IBOuZSFxY5gF3ceVYCSLtF/u3x6IbHfVXN4ITEi4Czn68vfYnxBYXtgSVFCQ4eCS
-RZmD7fixaHcLNRadA90K
-=KF4M
+iQIcBAEBCAAGBQJNqy5WAAoJELHSF2kinlg4u+IP/1LcGL+3zCoTr5HObKCKEXSQ
+m1vXbd3nscWWhd1pwMOdJTxMatApZWSZ14REeCY7SwYbqRv0qegAp0DLTuOXgLFb
++eacl4VVmASxf6dkehRvLIH6Ant/GE8hwMJuQnU1xpmQFqH3E0NW9GqcdkLBKHXS
+pxs7hTdFEnB3efhjbXEplPH6e1rQ/cemJQh5M5piMf3UTEMxcaxrwwsJW1mi5NoA
+Wfot66sCC7hgPiH8zeQmecGBk3JIHTqPX8U8tO2sj0EgUPR05BO+27E99CLkRZS8
+palA5n5ZwpZzoFt9NxAeYB78EA+YkGn4TNe6fCsnpSTp6vMPz+WKECmOp04d6Aq2
+4B/xsVUqz16/e7TTY0unIBfmWjN1I830Es3dRH96w9peCJGljO8k0U9KcARquGF1
+3F9d2qGfUGEahwSVyFYvUmvv4C2eVefwaUgtLkJ7zf9MN5dTddP5pU7Bvr8icl8U
+wyvbq2NyGtmLhkncvQigcipGE2efEIjcXmFPrJ8MImFmPISlZgTKJZteaWMI39se
+ZqtBvUUZAiMgDosGCXUsLyxVDa92jr0OICUTm0fLEVy6aqtyMRf0KHH0hgNE1hgp
+atTduJfC2/32ViUf8hVRO8f4nC7SIsNLqCo2p1cswUCegRqTg8Ss934mF+vMc2Oz
+nkNE8sNxUd4eTlAosiv0
+=vV/b
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/polkit-qt/polkit-qt-9999.ebuild b/sys-auth/polkit-qt/polkit-qt-9999.ebuild
index 8e5cec2f690..dfff03efc34 100644
--- a/sys-auth/polkit-qt/polkit-qt-9999.ebuild
+++ b/sys-auth/polkit-qt/polkit-qt-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=3
 
-inherit git cmake-utils
+inherit cmake-utils git-2
 
 DESCRIPTION="PolicyKit Qt4 API wrapper library."
 HOMEPAGE="http://kde.org/"
@@ -30,10 +30,6 @@ RDEPEND="${COMMON_DEPEND}
 
 DOCS=(AUTHORS README README.porting TODO)
 
-src_unpack() {
-	git_src_unpack
-}
-
 src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_build examples)