diff options
author | Bo Ørsted Andresen <zlin@gentoo.org> | 2008-02-15 19:48:40 +0000 |
---|---|---|
committer | Bo Ørsted Andresen <zlin@gentoo.org> | 2008-02-15 19:48:40 +0000 |
commit | 87766f2810a2e257cf79492dd8ec67937442d835 (patch) | |
tree | fccf09dae58aeaa598bbaf71ed8dcbf8b274d756 /eclass/kde4-meta.eclass | |
parent | Stable on ppc wrt bug 208901 (diff) | |
download | gentoo-2-87766f2810a2e257cf79492dd8ec67937442d835.tar.gz gentoo-2-87766f2810a2e257cf79492dd8ec67937442d835.tar.bz2 gentoo-2-87766f2810a2e257cf79492dd8ec67937442d835.zip |
Remove qimageblitz dependency from kdeutils modules that don't use it. Upstream already committed a fix to make it optional to trunk.
Diffstat (limited to 'eclass/kde4-meta.eclass')
-rw-r--r-- | eclass/kde4-meta.eclass | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index b8c140fca587..81c13f49ac49 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.1 2008/01/16 22:51:47 ingmar Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.2 2008/02/15 19:48:40 zlin Exp $ # # @ECLASS: kde4-meta.eclass # @MAINTAINER: @@ -402,6 +402,16 @@ kde4-meta_change_cmakelists() { esac fi ;; + # This is sort of a hack to avoid patching 16 kdeutils packages with + # r775410 from upstream trunk which makes blitz optional so superkaramba + # only gets compiled when it is found. Bug #209324. Remove this no later + # than 4.1. + kdeutils) + if [[ ${PN} != superkaramba && ${SLOT} == kde-4 ]]; then + sed -i -e '/find_package(Blitz REQUIRED)/d' "${S}"/CMakeLists.txt \ + || die "${LINENO}: sed to remove dependency on Blitz failed." + fi + ;; koffice) if [[ ${PN} != koffice-libs ]]; then sed -i -e '/^INSTALL(FILES.*koffice.desktop/ s/^/#DONOTINSTALL /' \ |