From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 3A354138CEB for ; Sun, 14 Jun 2015 17:01:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 410A2E0878; Sun, 14 Jun 2015 17:01:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C06D9E0898 for ; Sun, 14 Jun 2015 17:01:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A865D340A5C for ; Sun, 14 Jun 2015 17:01:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 53836A38 for ; Sun, 14 Jun 2015 17:01:18 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1434301265.56a63c0e98596a03a3feb69f68d120fc1d4d9282.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: sys-block/partitionmanager/ X-VCS-Repository: proj/kde X-VCS-Files: sys-block/partitionmanager/partitionmanager-9999.ebuild X-VCS-Directories: sys-block/partitionmanager/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 56a63c0e98596a03a3feb69f68d120fc1d4d9282 X-VCS-Branch: master Date: Sun, 14 Jun 2015 17:01:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1fa5205c-b168-4a47-a7af-3f5882cc38a3 X-Archives-Hash: 245fef65d708e19a1a43cdad65140660 commit: 56a63c0e98596a03a3feb69f68d120fc1d4d9282 Author: Andreas Sturmlechner gmail com> AuthorDate: Sat Jun 13 21:22:09 2015 +0000 Commit: Michael Palimaka gentoo 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 -}