diff options
| author | Tomáš Chvátal <scarabeus@gentoo.org> | 2009-10-27 15:21:33 +0100 |
|---|---|---|
| committer | Tomáš Chvátal <scarabeus@gentoo.org> | 2009-10-27 15:21:33 +0100 |
| commit | fddf924d6bef60fb712128d9ee4368395b29c96e (patch) | |
| tree | 81cf99a71831f66743bde9980eaa8ea38a16a935 /eclass | |
| parent | e6235c4b226fccc21ac058d6cddfaa4097b190b5 (diff) | |
| download | kde-fddf924d6bef60fb712128d9ee4368395b29c96e.tar.gz kde-fddf924d6bef60fb712128d9ee4368395b29c96e.tar.bz2 kde-fddf924d6bef60fb712128d9ee4368395b29c96e.zip | |
Fix undefined variable error.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kde4-base.eclass | 6 | ||||
| -rw-r--r-- | eclass/kde4-meta.eclass | 9 |
2 files changed, 13 insertions, 2 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index c746424118b..7f17fffaa8f 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -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/eclass/kde4-base.eclass,v 1.37 2009/05/09 13:23:15 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.48 2009/10/27 14:20:13 scarabeus Exp $ # @ECLASS: kde4-base.eclass # @MAINTAINER: @@ -28,12 +28,14 @@ else export_fns="src_configure src_compile src_test src_install" fi +inherit kde4-functions + get_build_type if [[ ${BUILD_TYPE} = live ]]; then subversion_eclass="subversion" fi -inherit base ${cmake_utils} eutils kde4-functions ${subversion_eclass} +inherit base ${cmake_utils} eutils ${subversion_eclass} EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare ${export_fns} pkg_postinst pkg_postrm diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index 8707062ec15..ea681406b6c 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -617,6 +617,15 @@ kde4-meta_change_cmakelists() { sed -e '/install(.\+config-openexr\.h.\+)/d' \ -i CMakeLists.txt || die "${LINENO}: sed died in collision prevention section" fi + # koffice 2.0 + case ${PV} in + 2.0.[1-9]) + sed -i -n -e '1h;1!H;${g;s/install(.\+config-openexr.h.\+)//;p}' \ + "${S}"/CMakeLists.txt || \ + die "${LINENO}: sed died in collision prevention section" + ;; + *) ;; + esac esac popd > /dev/null |