diff options
| author |   Jonathan Callen <jcallen@gentoo.org> | 2009-12-10 17:35:52 +0000 |
|---|---|---|
| committer | Jonathan Callen <jcallen@gentoo.org> | 2009-12-10 17:35:52 +0000 |
| commit | eb370d060b8a86e945fd420da312c34859a342c7 (patch) | |
| tree | 21bb0d7d5f75ac3884127ae7984f51ebc9708d62 /eclass/kde4-functions.eclass | |
| parent | Revision bump, create src_install so that the package actually installs somet... (diff) | |
| download | historical-eb370d060b8a86e945fd420da312c34859a342c7.tar.gz historical-eb370d060b8a86e945fd420da312c34859a342c7.tar.bz2 historical-eb370d060b8a86e945fd420da312c34859a342c7.zip | |
Update cmake-utils.eclass and kde4-*.eclass from kde overlay
Diffstat (limited to 'eclass/kde4-functions.eclass')
| -rw-r--r-- | eclass/kde4-functions.eclass | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index 0a1bed50f2a4..8dee78100bfa 100644 --- a/eclass/kde4-functions.eclass +++ b/eclass/kde4-functions.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-functions.eclass,v 1.27 2009/12/01 10:56:17 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.28 2009/12/10 17:35:52 abcd Exp $ inherit versionator @@ -17,7 +17,7 @@ inherit versionator # By default kde4 eclasses want EAPI 2 which might be redefinable to newer # versions. case ${EAPI:-0} in - 2) : ;; + 2|3) : ;; *) DEPEND="EAPI-TOO-OLD" ;; esac @@ -65,6 +65,8 @@ slot_is_at_least() { buildsycoca() { debug-print-function ${FUNCNAME} "$@" + [[ -z ${EROOT} ]] && EROOT=${ROOT}${EPREFIX} + local KDE3DIR="${EROOT}usr/kde/3.5" if [[ -z ${EROOT%%/} && -x "${KDE3DIR}"/bin/kbuildsycoca ]]; then # Since KDE3 is aware of shortcuts in /usr, rebuild database @@ -320,7 +322,7 @@ install_library_dependencies() { local depsfile="${T}/${PN}:${SLOT}" ebegin "Installing library dependencies as ${depsfile##*/}" - insinto ${EROOT}var/lib/kde + insinto /var/lib/kde doins "${depsfile}" || die "Failed to install library dependencies." eend $? } @@ -335,7 +337,7 @@ load_library_dependencies() { i=0 for pn in ${KMLOADLIBS} ; do ((i++)) - depsfile="${EROOT}var/lib/kde/${pn}:${SLOT}" + depsfile="${EPREFIX}/var/lib/kde/${pn}:${SLOT}" [[ -r "${depsfile}" ]] || die "Depsfile '${depsfile}' not accessible. You probably need to reinstall ${pn}." sed -i -e "${i}iINCLUDE(\"${depsfile}\")" "${S}/CMakeLists.txt" || \ die "Failed to include library dependencies for ${pn}" |