Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kdelibs/
Date: Sat, 10 Oct 2015 18:00:41
Message-Id: 1444500026.d95c336aa9ccf56c6ef4666ab106f6d44a58dc3a.kensington@gentoo
1 commit: d95c336aa9ccf56c6ef4666ab106f6d44a58dc3a
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 10 17:59:53 2015 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 10 18:00:26 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=d95c336a
7
8 kde-base/kdelibs: don't install old FindQt4.cmake
9
10 dev-util/cmake installs an updated version, and also includes some custom
11 changes needed to handle slotted Qt.
12
13 Gentoo-bug: 562746
14
15 Package-Manager: portage-2.2.20.1
16
17 kde-base/kdelibs/kdelibs-4.9999.ebuild | 3 +++
18 1 file changed, 3 insertions(+)
19
20 diff --git a/kde-base/kdelibs/kdelibs-4.9999.ebuild b/kde-base/kdelibs/kdelibs-4.9999.ebuild
21 index e40e74a..75792ae 100644
22 --- a/kde-base/kdelibs/kdelibs-4.9999.ebuild
23 +++ b/kde-base/kdelibs/kdelibs-4.9999.ebuild
24 @@ -179,6 +179,9 @@ src_prepare() {
25 # Try to fix kkeyserver_mac
26 epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch
27 fi
28 +
29 + # updated version ships with cmake
30 + sed -i -e "/FindQt4.cmake/d" cmake/modules/CMakeLists.txt || die
31 }
32
33 src_configure() {