diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2009-03-15 14:40:56 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-03-15 14:40:56 +0000 |
| commit | 85375608c43ef1aa9f1fe38762273cd4b8cddbd4 (patch) | |
| tree | 56aa3eb0abb93b5ab831cd55219543f974dcbda2 | |
| parent | Manifest fix (diff) | |
| download | gentoo-2-85375608c43ef1aa9f1fe38762273cd4b8cddbd4.tar.gz gentoo-2-85375608c43ef1aa9f1fe38762273cd4b8cddbd4.tar.bz2 gentoo-2-85375608c43ef1aa9f1fe38762273cd4b8cddbd4.zip | |
Automatic-merge: merge updates for 4.2.1 from kde-testing.
(Portage version: 2.2_rc25/cvs/Linux x86_64)
| -rw-r--r-- | kde-base/lokalize/ChangeLog | 5 | ||||
| -rw-r--r-- | kde-base/lokalize/lokalize-4.2.1.ebuild | 10 |
2 files changed, 13 insertions, 2 deletions
diff --git a/kde-base/lokalize/ChangeLog b/kde-base/lokalize/ChangeLog index 03bf5aef8299..b3a40e743806 100644 --- a/kde-base/lokalize/ChangeLog +++ b/kde-base/lokalize/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for kde-base/lokalize # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/lokalize/ChangeLog,v 1.10 2009/03/08 20:51:00 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/lokalize/ChangeLog,v 1.11 2009/03/15 14:40:56 scarabeus Exp $ + + 15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> lokalize-4.2.1.ebuild: + Automatic-merge: merge updates for 4.2.1 from kde-testing. 08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org> -lokalize-4.2.0.ebuild: Drop KDE 4.2.0 diff --git a/kde-base/lokalize/lokalize-4.2.1.ebuild b/kde-base/lokalize/lokalize-4.2.1.ebuild index 96741e3b70b4..3b79c36553ec 100644 --- a/kde-base/lokalize/lokalize-4.2.1.ebuild +++ b/kde-base/lokalize/lokalize-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/lokalize/lokalize-4.2.1.ebuild,v 1.1 2009/03/04 22:46:12 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/lokalize/lokalize-4.2.1.ebuild,v 1.2 2009/03/15 14:40:56 scarabeus Exp $ EAPI="2" @@ -10,3 +10,11 @@ inherit kde4-meta DESCRIPTION="KDE4 translation tool" 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 +} |