summaryrefslogtreecommitdiff
path: root/sys-block
diff options
context:
space:
mode:
authorAndreas Sturmlechner <andreas.sturmlechner@gmail.com>2015-06-13 23:22:09 +0200
committerMichael Palimaka <kensington@gentoo.org>2015-06-15 03:01:05 +1000
commit56a63c0e98596a03a3feb69f68d120fc1d4d9282 (patch)
tree750e06e9542edd0426c64edf2b1b5404c82d01e7 /sys-block
parentde8883ae929776870d53e01db47db0d0d4c91a9a (diff)
downloadkde-56a63c0e98596a03a3feb69f68d120fc1d4d9282.tar.gz
kde-56a63c0e98596a03a3feb69f68d120fc1d4d9282.tar.bz2
kde-56a63c0e98596a03a3feb69f68d120fc1d4d9282.zip
[sys-block/partitionmanager] Conflict solved upstream
Package-Manager: portage-2.2.20
Diffstat (limited to 'sys-block')
-rw-r--r--sys-block/partitionmanager/partitionmanager-9999.ebuild7
1 files changed, 0 insertions, 7 deletions
diff --git a/sys-block/partitionmanager/partitionmanager-9999.ebuild b/sys-block/partitionmanager/partitionmanager-9999.ebuild
index 35ec7a4230e..13ef63f9462 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
-}