diff options
author | Tomas Chvatal <scarabeus@gentoo.org> | 2009-03-15 14:36:59 +0000 |
---|---|---|
committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-03-15 14:36:59 +0000 |
commit | 66a7acf012333f92ef05503c9d5dc26835654b86 (patch) | |
tree | 25ab5be59cf2462693b55226710f7f3e7c36c38c /kde-base | |
parent | Automatic-merge: merge updates for 4.2.1 from kde-testing. (diff) | |
download | gentoo-2-66a7acf012333f92ef05503c9d5dc26835654b86.tar.gz gentoo-2-66a7acf012333f92ef05503c9d5dc26835654b86.tar.bz2 gentoo-2-66a7acf012333f92ef05503c9d5dc26835654b86.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/kuiviewer/ChangeLog | 5 | ||||
-rw-r--r-- | kde-base/kuiviewer/kuiviewer-4.2.1.ebuild | 10 |
2 files changed, 13 insertions, 2 deletions
diff --git a/kde-base/kuiviewer/ChangeLog b/kde-base/kuiviewer/ChangeLog index 9b6238a69d3b..e541939a9213 100644 --- a/kde-base/kuiviewer/ChangeLog +++ b/kde-base/kuiviewer/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for kde-base/kuiviewer # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kuiviewer/ChangeLog,v 1.92 2009/03/08 20:37:11 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kuiviewer/ChangeLog,v 1.93 2009/03/15 14:36:59 scarabeus Exp $ + + 15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> kuiviewer-4.2.1.ebuild: + Automatic-merge: merge updates for 4.2.1 from kde-testing. 08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org> -kuiviewer-4.2.0.ebuild: Drop KDE 4.2.0 diff --git a/kde-base/kuiviewer/kuiviewer-4.2.1.ebuild b/kde-base/kuiviewer/kuiviewer-4.2.1.ebuild index 65dd012feb3f..6d1403c5b305 100644 --- a/kde-base/kuiviewer/kuiviewer-4.2.1.ebuild +++ b/kde-base/kuiviewer/kuiviewer-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/kuiviewer/kuiviewer-4.2.1.ebuild,v 1.1 2009/03/04 22:30:43 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kuiviewer/kuiviewer-4.2.1.ebuild,v 1.2 2009/03/15 14:36:59 scarabeus Exp $ EAPI="2" @@ -10,3 +10,11 @@ inherit kde4-meta DESCRIPTION="KUIViewer - Displays Designer's UI 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 +} |