diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2009-03-15 14:44:37 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-03-15 14:44:37 +0000 |
| commit | 2b9d0884c9fe8aac70393fbb4d5d86d4210086ce (patch) | |
| tree | c3be00b824a6c569c3e680511200ecb893c69ac2 /kde-base | |
| parent | Automatic-merge: merge updates for 4.2.1 from kde-testing. (diff) | |
| download | gentoo-2-2b9d0884c9fe8aac70393fbb4d5d86d4210086ce.tar.gz gentoo-2-2b9d0884c9fe8aac70393fbb4d5d86d4210086ce.tar.bz2 gentoo-2-2b9d0884c9fe8aac70393fbb4d5d86d4210086ce.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')
| -rw-r--r-- | kde-base/umbrello/ChangeLog | 5 | ||||
| -rw-r--r-- | kde-base/umbrello/umbrello-4.2.1.ebuild | 10 |
2 files changed, 13 insertions, 2 deletions
diff --git a/kde-base/umbrello/ChangeLog b/kde-base/umbrello/ChangeLog index c7bffc37c886..479c3db38457 100644 --- a/kde-base/umbrello/ChangeLog +++ b/kde-base/umbrello/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for kde-base/umbrello # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/ChangeLog,v 1.107 2009/03/08 21:01:04 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/ChangeLog,v 1.108 2009/03/15 14:44:37 scarabeus Exp $ + + 15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> umbrello-4.2.1.ebuild: + Automatic-merge: merge updates for 4.2.1 from kde-testing. 08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org> -umbrello-4.2.0.ebuild: Drop KDE 4.2.0 diff --git a/kde-base/umbrello/umbrello-4.2.1.ebuild b/kde-base/umbrello/umbrello-4.2.1.ebuild index 6518b4764a28..f92b9457b358 100644 --- a/kde-base/umbrello/umbrello-4.2.1.ebuild +++ b/kde-base/umbrello/umbrello-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/umbrello/umbrello-4.2.1.ebuild,v 1.2 2009/03/08 14:22:40 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/umbrello-4.2.1.ebuild,v 1.3 2009/03/15 14:44:37 scarabeus Exp $ EAPI="2" @@ -17,3 +17,11 @@ DEPEND=" dev-libs/libxslt " RDEPEND="${DEPEND}" + +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 +} |