commit: 56a63c0e98596a03a3feb69f68d120fc1d4d9282
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Jun 13 21:22:09 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jun 14 17:01:05 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=56a63c0e
[sys-block/partitionmanager] Conflict solved upstream
Package-Manager: portage-2.2.20
sys-block/partitionmanager/partitionmanager-9999.ebuild | 7 -------
1 file changed, 7 deletions(-)
diff --git a/sys-block/partitionmanager/partitionmanager-9999.ebuild
b/sys-block/partitionmanager/partitionmanager-9999.ebuild
index 35ec7a4..13ef63f 100644
--- a/sys-block/partitionmanager/partitionmanager-9999.ebuild
+++ b/sys-block/partitionmanager/partitionmanager-9999.ebuild
@@ -37,10 +37,3 @@ RDEPEND="${DEPEND}
>=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
-}