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 BD94113888F for ; Sat, 10 Oct 2015 18:00:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 516C9E0804; Sat, 10 Oct 2015 18:00:41 +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 075A7E0804 for ; Sat, 10 Oct 2015 18:00:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 12E2133FA71 for ; Sat, 10 Oct 2015 18:00:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 03FCBB9 for ; Sat, 10 Oct 2015 18:00:37 +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: <1444500026.d95c336aa9ccf56c6ef4666ab106f6d44a58dc3a.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kdelibs/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/kdelibs/kdelibs-4.9999.ebuild X-VCS-Directories: kde-base/kdelibs/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: d95c336aa9ccf56c6ef4666ab106f6d44a58dc3a X-VCS-Branch: master Date: Sat, 10 Oct 2015 18:00:37 +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: 57367677-cdcc-49da-9ed9-37b631eb4988 X-Archives-Hash: 68d41e0aa92b2fb4c4db05e6ae64ccde commit: d95c336aa9ccf56c6ef4666ab106f6d44a58dc3a Author: Michael Palimaka gentoo org> AuthorDate: Sat Oct 10 17:59:53 2015 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Sat Oct 10 18:00:26 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=d95c336a kde-base/kdelibs: don't install old FindQt4.cmake dev-util/cmake installs an updated version, and also includes some custom changes needed to handle slotted Qt. Gentoo-bug: 562746 Package-Manager: portage-2.2.20.1 kde-base/kdelibs/kdelibs-4.9999.ebuild | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kde-base/kdelibs/kdelibs-4.9999.ebuild b/kde-base/kdelibs/kdelibs-4.9999.ebuild index e40e74a..75792ae 100644 --- a/kde-base/kdelibs/kdelibs-4.9999.ebuild +++ b/kde-base/kdelibs/kdelibs-4.9999.ebuild @@ -179,6 +179,9 @@ src_prepare() { # Try to fix kkeyserver_mac epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch fi + + # updated version ships with cmake + sed -i -e "/FindQt4.cmake/d" cmake/modules/CMakeLists.txt || die } src_configure() {