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 CD31E13888F for ; Wed, 14 Oct 2015 14:37:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 59E92E07FE; Wed, 14 Oct 2015 14:37:03 +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 015FAE07FE for ; Wed, 14 Oct 2015 14:37:02 +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 31E8A3409E6 for ; Wed, 14 Oct 2015 14:37:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8DAE110C7 for ; Wed, 14 Oct 2015 14:36:59 +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: <1444833411.d03736592f7a17b0748249193e11a43638189cc7.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: d03736592f7a17b0748249193e11a43638189cc7 X-VCS-Branch: master Date: Wed, 14 Oct 2015 14:36:59 +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: 4f0c64d9-021a-429e-b52d-99e2a64cf290 X-Archives-Hash: 5ae296ff57e9dc5c76e7297e6c32750e commit: d03736592f7a17b0748249193e11a43638189cc7 Author: Michael Palimaka gentoo org> AuthorDate: Wed Oct 14 14:33:43 2015 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Wed Oct 14 14:36:51 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=d0373659 kde-base/kdelibs: install old FindQt4.cmake again Even though we weren't installing it, the bundled FindQt4 was of course still used to build kdelib. Removing it completely caused build to fail, so we patched it instead in d6670de2ad936104b89466504ba6c003bbdb40d1. This reverts commit d95c336aa9ccf56c6ef4666ab106f6d44a58dc3a. kde-base/kdelibs/kdelibs-4.9999.ebuild | 3 --- 1 file changed, 3 deletions(-) diff --git a/kde-base/kdelibs/kdelibs-4.9999.ebuild b/kde-base/kdelibs/kdelibs-4.9999.ebuild index 2b88052..6201109 100644 --- a/kde-base/kdelibs/kdelibs-4.9999.ebuild +++ b/kde-base/kdelibs/kdelibs-4.9999.ebuild @@ -180,9 +180,6 @@ 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() {