diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2009-03-15 14:33:54 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-03-15 14:33:54 +0000 |
| commit | f8370dad250a9084a50f1fad48cd801ccca9f0da (patch) | |
| tree | 9ab363d8cacab01cd10743cd1350856f0eb3cf41 /kde-base/kompare | |
| parent | Automatic-merge: merge updates for 4.2.1 from kde-testing. (diff) | |
| download | gentoo-2-f8370dad250a9084a50f1fad48cd801ccca9f0da.tar.gz gentoo-2-f8370dad250a9084a50f1fad48cd801ccca9f0da.tar.bz2 gentoo-2-f8370dad250a9084a50f1fad48cd801ccca9f0da.zip | |
Automatic-merge: merge updates for 4.2.1 from kde-testing.
(Portage version: 2.2_rc25/cvs/Linux x86_64)
Diffstat (limited to 'kde-base/kompare')
| -rw-r--r-- | kde-base/kompare/ChangeLog | 5 | ||||
| -rw-r--r-- | kde-base/kompare/kompare-4.2.1.ebuild | 10 |
2 files changed, 13 insertions, 2 deletions
diff --git a/kde-base/kompare/ChangeLog b/kde-base/kompare/ChangeLog index 10c60c25ea61..f36765494d82 100644 --- a/kde-base/kompare/ChangeLog +++ b/kde-base/kompare/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for kde-base/kompare # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kompare/ChangeLog,v 1.103 2009/03/08 20:09:39 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kompare/ChangeLog,v 1.104 2009/03/15 14:33:54 scarabeus Exp $ + + 15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kompare-4.2.1.ebuild: + Automatic-merge: merge updates for 4.2.1 from kde-testing. 08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org> -kompare-4.2.0.ebuild, -kompare-4.2.0-r1.ebuild: diff --git a/kde-base/kompare/kompare-4.2.1.ebuild b/kde-base/kompare/kompare-4.2.1.ebuild index a537e9894583..5553f7613760 100644 --- a/kde-base/kompare/kompare-4.2.1.ebuild +++ b/kde-base/kompare/kompare-4.2.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kompare/kompare-4.2.1.ebuild,v 1.1 2009/03/04 21:59:10 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kompare/kompare-4.2.1.ebuild,v 1.2 2009/03/15 14:33:54 scarabeus Exp $ EAPI="2" @@ -10,3 +10,11 @@ inherit kde4-meta DESCRIPTION="Kompare is a program to view the differences between files." KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="debug" + +src_prepare() { + # Disable hardcoded kdepimlibs check - only 4.2 branch is affected + sed -i -e 's/find_package(KdepimLibs REQUIRED)/macro_optional_find_package(KdepimLibs)/' \ + CMakeLists.txt || die "failed to disable kdepimlibs hardcoded check" + + kde4-meta_src_prepare +} |