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 | 4f570858d8bb01899198c9d42cfec21cfeb5d278 (patch) | |
| tree | eab6531ea0b8d7e0a76167a5c5cffb842cc486e7 /kde-base/kapptemplate | |
| parent | Manifest fix (diff) | |
| download | historical-4f570858d8bb01899198c9d42cfec21cfeb5d278.tar.gz historical-4f570858d8bb01899198c9d42cfec21cfeb5d278.tar.bz2 historical-4f570858d8bb01899198c9d42cfec21cfeb5d278.zip | |
Automatic-merge: merge updates for 4.2.1 from kde-testing.
Package-Manager: portage-2.2_rc25/cvs/Linux x86_64
Diffstat (limited to 'kde-base/kapptemplate')
| -rw-r--r-- | kde-base/kapptemplate/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/kapptemplate/kapptemplate-4.2.1.ebuild | 10 |
2 files changed, 14 insertions, 2 deletions
diff --git a/kde-base/kapptemplate/ChangeLog b/kde-base/kapptemplate/ChangeLog index e1369fd7dedb..9bb7320ecc53 100644 --- a/kde-base/kapptemplate/ChangeLog +++ b/kde-base/kapptemplate/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kapptemplate # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kapptemplate/ChangeLog,v 1.85 2009/03/08 19:00:42 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kapptemplate/ChangeLog,v 1.86 2009/03/15 14:19:39 scarabeus Exp $ + + 15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> + kapptemplate-4.2.1.ebuild: + Automatic-merge: merge updates for 4.2.1 from kde-testing. 08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org> -kapptemplate-4.2.0.ebuild: diff --git a/kde-base/kapptemplate/kapptemplate-4.2.1.ebuild b/kde-base/kapptemplate/kapptemplate-4.2.1.ebuild index e783429d93ff..fb81067f08eb 100644 --- a/kde-base/kapptemplate/kapptemplate-4.2.1.ebuild +++ b/kde-base/kapptemplate/kapptemplate-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/kapptemplate/kapptemplate-4.2.1.ebuild,v 1.1 2009/03/04 20:31:10 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kapptemplate/kapptemplate-4.2.1.ebuild,v 1.2 2009/03/15 14:19:39 scarabeus Exp $ EAPI="2" @@ -13,3 +13,11 @@ IUSE="debug" # Fails, checked revision 810882. RESTRICT="test" + +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 +} |