[gentoo-commits] proj/kde:master commit in: sys-block/partitionmanager/

[Johannes Huber]

commit:     08580c361d7fffe1331fea12d811fc219d417221
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Jun 11 19:40:40 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Jun 11 20:05:02 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=08580c36

[sys-block/partitionmanager] DEPEND on sys-block/kpmcore

Remove file collision with sys-block/kpmcore

Package-Manager: portage-2.2.20

 sys-block/partitionmanager/partitionmanager-9999.ebuild | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/sys-block/partitionmanager/partitionmanager-9999.ebuild 
b/sys-block/partitionmanager/partitionmanager-9999.ebuild
index 5de45ff..35ec7a4 100644
--- a/sys-block/partitionmanager/partitionmanager-9999.ebuild
+++ b/sys-block/partitionmanager/partitionmanager-9999.ebuild
@@ -29,10 +29,18 @@ DEPEND="
        $(add_frameworks_dep kxmlgui)
        dev-qt/qtgui:5
        dev-qt/qtwidgets:5
+       sys-apps/util-linux
+       sys-block/kpmcore
 "
 RDEPEND="${DEPEND}
        dev-libs/libatasmart
-       sys-apps/util-linux
        >=sys-block/parted-3
        !sys-block/partitionmanager:0
 "
+
+src_install() {
+       kde5_src_install
+
+       # sys-block/kpmcore file collision
+       rm "${D}"/usr/share/config.kcfg/partitionmanager.kcfg
+}