summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2009-03-15 14:44:37 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2009-03-15 14:44:37 +0000
commit4f570858d8bb01899198c9d42cfec21cfeb5d278 (patch)
treeeab6531ea0b8d7e0a76167a5c5cffb842cc486e7 /kde-base/kdesdk-strigi-analyzer
parentManifest fix (diff)
downloadhistorical-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/kdesdk-strigi-analyzer')
-rw-r--r--kde-base/kdesdk-strigi-analyzer/ChangeLog6
-rw-r--r--kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-4.2.1.ebuild10
2 files changed, 14 insertions, 2 deletions
diff --git a/kde-base/kdesdk-strigi-analyzer/ChangeLog b/kde-base/kdesdk-strigi-analyzer/ChangeLog
index 3414bfb7026f..3e19c021add6 100644
--- a/kde-base/kdesdk-strigi-analyzer/ChangeLog
+++ b/kde-base/kdesdk-strigi-analyzer/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for kde-base/kdesdk-strigi-analyzer
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-strigi-analyzer/ChangeLog,v 1.10 2009/03/08 19:36:43 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-strigi-analyzer/ChangeLog,v 1.11 2009/03/15 14:27:50 scarabeus Exp $
+
+ 15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+ kdesdk-strigi-analyzer-4.2.1.ebuild:
+ Automatic-merge: merge updates for 4.2.1 from kde-testing.
08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org>
-kdesdk-strigi-analyzer-4.2.0.ebuild:
diff --git a/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-4.2.1.ebuild b/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-4.2.1.ebuild
index c48f25bd5e9e..238b1f68cef7 100644
--- a/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-4.2.1.ebuild
+++ b/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-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/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-4.2.1.ebuild,v 1.1 2009/03/04 21:14:33 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-strigi-analyzer/kdesdk-strigi-analyzer-4.2.1.ebuild,v 1.2 2009/03/15 14:27:50 scarabeus Exp $
EAPI="2"
@@ -11,3 +11,11 @@ inherit kde4-meta
DESCRIPTION="kdesdk: strigi plugins"
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
+}