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 2BF0F138247 for ; Fri, 22 Nov 2013 17:12:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E73D0E0983; Fri, 22 Nov 2013 17:11:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7F038E0983 for ; Fri, 22 Nov 2013 17:11:58 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6E2E633F257 for ; Fri, 22 Nov 2013 17:11:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 917EBE5459 for ; Fri, 22 Nov 2013 17:11:54 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1385140298.e6630cf9f59709813616a8d2ca2ea7c0485baf42.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-frameworks/kcoreaddons/ X-VCS-Repository: proj/kde X-VCS-Files: kde-frameworks/kcoreaddons/kcoreaddons-9999.ebuild X-VCS-Directories: kde-frameworks/kcoreaddons/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: e6630cf9f59709813616a8d2ca2ea7c0485baf42 X-VCS-Branch: master Date: Fri, 22 Nov 2013 17:11:54 +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: 922884e0-e8ed-4918-a80d-1bf4b5ddd24d X-Archives-Hash: 8e1f86aafc37f0cc14358d546d44d365 commit: e6630cf9f59709813616a8d2ca2ea7c0485baf42 Author: Johannes Huber gentoo org> AuthorDate: Fri Nov 22 17:11:38 2013 +0000 Commit: Johannes Huber gentoo org> CommitDate: Fri Nov 22 17:11:38 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e6630cf9 [kde-frameworks/kcoreaddons] File collision fixed upstream Package-Manager: portage-2.2.7 --- kde-frameworks/kcoreaddons/kcoreaddons-9999.ebuild | 7 ------- 1 file changed, 7 deletions(-) diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-9999.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-9999.ebuild index 6e28c63..d8bb625 100644 --- a/kde-frameworks/kcoreaddons/kcoreaddons-9999.ebuild +++ b/kde-frameworks/kcoreaddons/kcoreaddons-9999.ebuild @@ -25,10 +25,3 @@ src_configure() { kde-frameworks_src_configure } - -src_install() { - kde-frameworks_src_install - - # avoid collision with kdelibs:4 - mv "${D}"/usr/share/mime/packages/{kde,kde5}.xml || die -}