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 C9923138A1F for ; Wed, 29 Jan 2014 16:34:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5DC73E0B0C; Wed, 29 Jan 2014 16:34:07 +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 ED8FFE0B0C for ; Wed, 29 Jan 2014 16:34:06 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DEF0A33F4FC for ; Wed, 29 Jan 2014 16:34:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id A17FA18832 for ; Wed, 29 Jan 2014 16:34:04 +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: <1391013230.2051a24b02487a895f3520379b706da4c408240b.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-frameworks/kio/ X-VCS-Repository: proj/kde X-VCS-Files: kde-frameworks/kio/kio-9999.ebuild X-VCS-Directories: kde-frameworks/kio/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 2051a24b02487a895f3520379b706da4c408240b X-VCS-Branch: master Date: Wed, 29 Jan 2014 16:34:04 +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: e0417d9e-ade7-41e1-bafc-84b58982c9e3 X-Archives-Hash: 30a6c5da2b847b674779b1ee14388f16 commit: 2051a24b02487a895f3520379b706da4c408240b Author: Michael Palimaka gentoo org> AuthorDate: Wed Jan 29 16:33:50 2014 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Wed Jan 29 16:33:50 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=2051a24b [kde-frameworks/kio] Add workaround for doc file collisions. Package-Manager: portage-2.2.7 --- kde-frameworks/kio/kio-9999.ebuild | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/kde-frameworks/kio/kio-9999.ebuild b/kde-frameworks/kio/kio-9999.ebuild index 3544fc3..8761316 100644 --- a/kde-frameworks/kio/kio-9999.ebuild +++ b/kde-frameworks/kio/kio-9999.ebuild @@ -63,3 +63,8 @@ src_configure() { kde-frameworks_src_configure } + +src_install() { + # temporary fix to avoid colliding with kdelibs:4 + mv "${D}"/usr/share/doc/HTML/en/kioslave{,5} +}