summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--eclass/cmake-utils.eclass87
-rw-r--r--eclass/kde4-base.eclass82
-rw-r--r--eclass/kde4-functions.eclass10
-rw-r--r--eclass/kde4-meta.eclass32
4 files changed, 137 insertions, 74 deletions
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 28954c9eb422..713d8ada0a0f 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.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/cmake-utils.eclass,v 1.34 2009/10/27 21:20:40 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.35 2009/12/10 17:35:52 abcd Exp $
# @ECLASS: cmake-utils.eclass
# @MAINTAINER:
@@ -40,7 +40,7 @@ inherit toolchain-funcs multilib flag-o-matic base
CMAKE_EXPF="src_compile src_test src_install"
case ${EAPI:-0} in
- 2) CMAKE_EXPF+=" src_configure" ;;
+ 3|2) CMAKE_EXPF+=" src_configure" ;;
1|0) ;;
*) die "Unknown EAPI, Bug eclass maintainers." ;;
esac
@@ -148,7 +148,7 @@ _check_build_dir() {
# files should be located.
#
# For installing binary doins "${CMAKE_BUILD_DIR}/${PN}"
- if [[ -n "${CMAKE_IN_SOURCE_BUILD}" ]]; then
+ if [[ -n ${CMAKE_IN_SOURCE_BUILD} ]]; then
# we build in source dir
CMAKE_BUILD_DIR="${CMAKE_USE_DIR}"
elif [[ ${CMAKE_USE_DIR} = ${WORKDIR} ]]; then
@@ -247,10 +247,11 @@ _modify-cmakelists() {
|| die "${LINENO}: failed to disable hardcoded settings"
# NOTE Append some useful summary here
- echo '
-MESSAGE(STATUS "<<< Gentoo configuration >>>
-Build type: ${CMAKE_BUILD_TYPE}
-Install path: ${CMAKE_INSTALL_PREFIX}\n")' >> CMakeLists.txt
+ cat >> CMakeLists.txt <<- _EOF_
+ MESSAGE(STATUS "<<< Gentoo configuration >>>
+ Build type: ${CMAKE_BUILD_TYPE}
+ Install path: ${CMAKE_INSTALL_PREFIX}\n")
+ _EOF_
}
# @FUNCTION: enable_cmake-utils_src_configure
@@ -263,7 +264,7 @@ enable_cmake-utils_src_configure() {
_check_build_dir init
# check if CMakeLists.txt exist and if no then die
- if [[ ! -e "${CMAKE_USE_DIR}"/CMakeLists.txt ]] ; then
+ if [[ ! -e ${CMAKE_USE_DIR}/CMakeLists.txt ]] ; then
eerror "I was unable to locate CMakeLists.txt under:"
eerror "\"${CMAKE_USE_DIR}/CMakeLists.txt\""
eerror "You should consider not inheriting the cmake eclass."
@@ -285,38 +286,58 @@ enable_cmake-utils_src_configure() {
fi
# Prepare Gentoo override rules (set valid compiler, append CPPFLAGS)
- local build_rules="${TMPDIR}"/gentoo_rules.cmake
-cat > ${build_rules} << _EOF_
-SET (CMAKE_C_COMPILER $(type -P $(tc-getCC)) CACHE FILEPATH "C compiler" FORCE)
-SET (CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE)
-SET (CMAKE_CXX_COMPILER $(type -P $(tc-getCXX)) CACHE FILEPATH "C++ compiler" FORCE)
-SET (CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C++ compile command" FORCE)
-_EOF_
+ local build_rules=${T}/gentoo_rules.cmake
+ cat > "${build_rules}" <<- _EOF_
+ SET (CMAKE_C_COMPILER $(type -P $(tc-getCC)) CACHE FILEPATH "C compiler" FORCE)
+ SET (CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE)
+ SET (CMAKE_CXX_COMPILER $(type -P $(tc-getCXX)) CACHE FILEPATH "C++ compiler" FORCE)
+ SET (CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C++ compile command" FORCE)
+ _EOF_
+
+ if use prefix; then
+ cat >> "${build_rules}" <<- _EOF_
+ # in Prefix we need rpath and must ensure cmake gets our default linker path
+ # right ... except for Darwin hosts
+ IF (NOT APPLE)
+ SET (CMAKE_SKIP_RPATH OFF CACHE BOOL "" FORCE)
+ SET (CMAKE_PLATFORM_REQUIRED_RUNTIME_PATH "${EPREFIX}/usr/${CHOST}/lib/gcc;${EPREFIX}/usr/${CHOST}/lib;${EPREFIX}/usr/$(get_libdir);${EPREFIX}/$(get_libdir)"
+ CACHE STRING "" FORCE)
+ ENDIF (NOT APPLE)
+ _EOF_
+ fi
+
+ # Common configure parameters (invariants)
+ local common_config=${T}/gentoo_common_config.cmake
+ local libdir=$(get_libdir)
+ cat > "${common_config}" <<- _EOF_
+ SET (LIB_SUFFIX ${libdir/lib} CACHE STRING "library path suffix" FORCE)
+ _EOF_
+ [[ -n ${CMAKE_NO_COLOR} ]] && echo 'SET (CMAKE_COLOR_MAKEFILE OFF CACHE BOOL "pretty colors during make" FORCE)' >> "${common_config}"
+
+ # Convert mycmakeargs to an array, for backwards compatibility
+ if [[ $(declare -p mycmakeargs) != "declare -a mycmakeargs="* ]]; then
+ mycmakeargs=(${mycmakeargs})
+ fi
+
+ has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
# Common configure parameters (overridable)
# NOTE CMAKE_BUILD_TYPE can be only overriden via CMAKE_BUILD_TYPE eclass variable
# No -DCMAKE_BUILD_TYPE=xxx definitions will be in effect.
- local cmakeargs="
- -DCMAKE_INSTALL_PREFIX=${PREFIX:-/usr}
- ${mycmakeargs}
- -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+ local cmakeargs=(
+ -C "${common_config}"
+ -DCMAKE_INSTALL_PREFIX="${PREFIX:-${EPREFIX}/usr}"
+ "${mycmakeargs[@]}"
+ -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}"
-DCMAKE_INSTALL_DO_STRIP=OFF
- -DCMAKE_USER_MAKE_RULES_OVERRIDE=${build_rules}"
-
- # Common configure parameters (invariants)
- local common_config="${TMPDIR}"/gentoo_common_config.cmake
- local libdir=$(get_libdir)
-cat > ${common_config} << _EOF_
-SET (LIB_SUFFIX ${libdir/lib} CACHE STRING "library path suffix" FORCE)
-_EOF_
- [[ -n ${CMAKE_NO_COLOR} ]] && echo 'SET (CMAKE_COLOR_MAKEFILE OFF CACHE BOOL "pretty colors during make" FORCE)' >> ${common_config}
- cmakeargs="-C ${common_config} ${cmakeargs}"
+ -DCMAKE_USER_MAKE_RULES_OVERRIDE="${build_rules}"
+ )
mkdir -p "${CMAKE_BUILD_DIR}"
pushd "${CMAKE_BUILD_DIR}" > /dev/null
- debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: mycmakeargs is $cmakeargs"
- echo cmake ${cmakeargs} "${CMAKE_USE_DIR}"
- cmake ${cmakeargs} "${CMAKE_USE_DIR}" || die "cmake failed"
+ debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: mycmakeargs is ${cmakeargs[*]}"
+ echo cmake "${cmakeargs[@]}" "${CMAKE_USE_DIR}"
+ cmake "${cmakeargs[@]}" "${CMAKE_USE_DIR}" || die "cmake failed"
popd > /dev/null
}
@@ -335,7 +356,7 @@ enable_cmake-utils_src_compile() {
# @FUNCTION: cmake-utils_src_make
# @DESCRIPTION:
# Function for building the package. Automatically detects the build type.
-# All arguments are passed to emake:
+# All arguments are passed to emake
cmake-utils_src_make() {
debug-print-function ${FUNCNAME} "$@"
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 39de1a5858e0..a17ae039fc3e 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.55 2009/12/02 17:07:05 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.56 2009/12/10 17:35:52 abcd Exp $
# @ECLASS: kde4-base.eclass
# @MAINTAINER:
@@ -60,6 +60,12 @@ esac
# This variable must be set before inheriting any eclasses. Defaults to 'never'.
OPENGL_REQUIRED="${OPENGL_REQUIRED:-never}"
+# @ECLASS-VARIABLE: MULTIMEDIA_REQUIRED
+# @DESCRIPTION:
+# Is qt-multimedia required? Possible values are 'always', 'optional' and 'never'.
+# This variable must be set before inheriting any eclasses. Defaults to 'never'.
+MULTIMEDIA_REQUIRED="${MULTIMEDIA_REQUIRED:-never}"
+
# @ECLASS-VARIABLE: WEBKIT_REQUIRED
# @DESCRIPTION:
# Is qt-webkit requred? Possible values are 'always', 'optional' and 'never'.
@@ -167,6 +173,22 @@ case ${OPENGL_REQUIRED} in
esac
unset qtopengldepend
+# MultiMedia dependencies
+qtmultimediadepend="
+ >=x11-libs/qt-multimedia-${QT_MINIMAL}:4
+"
+case ${MULTIMEDIA_REQUIRED} in
+ always)
+ COMMONDEPEND+=" ${qtmultimediadepend}"
+ ;;
+ optional)
+ IUSE+=" multimedia"
+ COMMONDEPEND+=" multimedia? ( ${qtmultimediadepend} )"
+ ;;
+ *) ;;
+esac
+unset qtmultimediadepend
+
# WebKit dependencies
case ${KDE_REQUIRED} in
always)
@@ -402,7 +424,11 @@ kde4-base_pkg_setup() {
debug-print-function ${FUNCNAME} "$@"
# Prefix compat:
- use prefix || EROOT=${ROOT}
+ if [[ ${EAPI} == 2 ]] && ! use prefix; then
+ EPREFIX=
+ EROOT=${ROOT}
+ fi
+
# Append missing trailing slash character
[[ ${EROOT} = */ ]] || EROOT+="/"
@@ -414,11 +440,11 @@ kde4-base_pkg_setup() {
if [[ ${KDEBASE} = kde-base ]]; then
if use kdeprefix; then
- KDEDIR="${EROOT}usr/kde/${_kdedir}"
+ KDEDIR=${EPREFIX}/usr/kde/${_kdedir}
else
- KDEDIR="${EROOT}usr"
+ KDEDIR=${EPREFIX}/usr
fi
- PREFIX="${PREFIX:-${KDEDIR}}"
+ : ${PREFIX:=${KDEDIR}}
else
# Determine KDEDIR by loooking for the closest match with KDE_MINIMAL
KDEDIR=
@@ -427,9 +453,9 @@ kde4-base_pkg_setup() {
[[ -z ${kde_minimal_met} ]] && [[ ${slot} = ${KDE_MINIMAL} ]] && kde_minimal_met=1
if [[ -n ${kde_minimal_met} ]] && has_version "kde-base/kdelibs:${slot}"; then
if has_version "kde-base/kdelibs:${slot}[kdeprefix]"; then
- KDEDIR="${EROOT}usr/kde/${slot}"
+ KDEDIR=${EPREFIX}/usr/kde/${slot}
else
- KDEDIR="${EROOT}usr"
+ KDEDIR=${EPREFIX}/usr
fi
break;
fi
@@ -440,10 +466,10 @@ kde4-base_pkg_setup() {
if [[ ${KDE_REQUIRED} = always ]] || { [[ ${KDE_REQUIRED} = optional ]] && use kde; }; then
[[ -z ${KDEDIR} ]] && die "Failed to determine KDEDIR!"
else
- [[ -z ${KDEDIR} ]] && KDEDIR="${EROOT}usr"
+ [[ -z ${KDEDIR} ]] && KDEDIR=${EPREFIX}/usr
fi
- PREFIX="${PREFIX:-${EROOT}usr}"
+ : ${PREFIX:=${EPREFIX}/usr}
fi
# Point pkg-config path to KDE *.pc files
export PKG_CONFIG_PATH="${KDEDIR}/$(get_libdir)/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}}"
@@ -465,10 +491,10 @@ kde4-base_src_unpack() {
if [[ ${BUILD_TYPE} = live ]]; then
migrate_store_dir
subversion_src_unpack
- elif [[ ${EAPI} == 2 ]]; then
+ elif [[ ${EAPI} == [23] ]]; then
local file
for file in ${A}; do
- # This setup is because EAPI <= 2 cannot unpack *.tar.xz files
+ # This setup is because EAPI <= 3 cannot unpack *.tar.xz files
# directly, so we do it ourselves (using the exact same code as portage)
case ${file} in
*.tar.xz)
@@ -482,7 +508,7 @@ kde4-base_src_unpack() {
esac
done
else
- # For EAPI >= 3, we can just use unpack() directly
+ # For EAPI >= 4, we can just use unpack() directly
unpack ${A}
fi
}
@@ -529,10 +555,10 @@ kde4-base_src_configure() {
debug-print-function ${FUNCNAME} "$@"
# Build tests in src_test only, where we override this value
- local cmakeargs="-DKDE4_BUILD_TESTS=OFF"
+ local cmakeargs=(-DKDE4_BUILD_TESTS=OFF)
if has kdeenablefinal ${IUSE//+} && use kdeenablefinal; then
- cmakeargs+=" -DKDE4_ENABLE_FINAL=ON"
+ cmakeargs+=(-DKDE4_ENABLE_FINAL=ON)
fi
if has debug ${IUSE//+} && use debug; then
@@ -544,10 +570,10 @@ kde4-base_src_configure() {
fi
# Set distribution name
- [[ ${PN} = kdelibs ]] && cmakeargs+=" -DKDE_DISTRIBUTION_TEXT=Gentoo"
+ [[ ${PN} = kdelibs ]] && cmakeargs+=(-DKDE_DISTRIBUTION_TEXT=Gentoo)
# Here we set the install prefix
- cmakeargs+=" -DCMAKE_INSTALL_PREFIX=${PREFIX}"
+ cmakeargs+=(-DCMAKE_INSTALL_PREFIX="${PREFIX}")
# Use colors
QTEST_COLORED=1
@@ -556,27 +582,31 @@ kde4-base_src_configure() {
unset KDEDIRS
# Handle kdeprefix-ed KDE
- if [[ ${KDEDIR} != "${EROOT}usr" ]]; then
+ if [[ ${KDEDIR} != ${EPREFIX}/usr ]]; then
# Override some environment variables - only when kdeprefix is different,
# to not break ccache/distcc
PATH="${KDEDIR}/bin:${PATH}"
LDPATH="${KDEDIR}/$(get_libdir):${LDPATH}"
# Append full RPATH
- cmakeargs+=" -DCMAKE_SKIP_RPATH=OFF"
+ cmakeargs+=(-DCMAKE_SKIP_RPATH=OFF)
# Set cmake prefixes to allow buildsystem to locate valid KDE installation
# when more are present
- cmakeargs+=" -DCMAKE_SYSTEM_PREFIX_PATH=${KDEDIR}"
+ cmakeargs+=(-DCMAKE_SYSTEM_PREFIX_PATH="${KDEDIR}")
fi
# Handle kdeprefix in application itself
if ! has kdeprefix ${IUSE//+} || ! use kdeprefix; then
# If prefix is /usr, sysconf needs to be /etc, not /usr/etc
- cmakeargs+=" -DSYSCONF_INSTALL_DIR=${EROOT}etc"
+ cmakeargs+=(-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc)
+ fi
+
+ if [[ $(declare -p mycmakeargs) != "declare -a mycmakeargs="* ]]; then
+ mycmakeargs=(${mycmakeargs})
fi
- mycmakeargs="${cmakeargs} ${mycmakeargs}"
+ mycmakeargs=("${cmakeargs[@]}" "${mycmakeargs[@]}")
cmake-utils_src_configure
}
@@ -597,7 +627,7 @@ kde4-base_src_test() {
debug-print-function ${FUNCNAME} "$@"
# Override this value, set in kde4-base_src_configure()
- mycmakeargs+=" -DKDE4_BUILD_TESTS=ON"
+ mycmakeargs+=(-DKDE4_BUILD_TESTS=ON)
cmake-utils_src_configure
kde4-base_src_compile
@@ -639,12 +669,14 @@ kde4-base_src_make_doc() {
done
fi
- if [[ -n ${KDEBASE} ]] && [[ -d "${D}${EROOT}usr/share/doc/${PF}" ]]; then
+ [[ -z ${ED} ]] && ED=${D}${EPREFIX}
+
+ if [[ -n ${KDEBASE} ]] && [[ -d ${ED}usr/share/doc/${PF} ]]; then
# work around bug #97196
dodir /usr/share/doc/KDE4 && \
- cp -r "${D}${EROOT}usr/share/doc/${PF}" "${D}${EROOT}usr/share/doc/KDE4/" || \
+ cp -r "${ED}usr/share/doc/${PF}" "${ED}usr/share/doc/KDE4/" || \
die "Failed to move docs to KDE4/."
- rm -rf "${D}${EROOT}usr/share/doc/${PF}"
+ rm -rf "${ED}usr/share/doc/${PF}"
fi
}
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}"
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
index 83192ec42b1e..aaf4aef54f7d 100644
--- a/eclass/kde4-meta.eclass
+++ b/eclass/kde4-meta.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-meta.eclass,v 1.29 2009/12/02 17:07:05 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.30 2009/12/10 17:35:52 abcd Exp $
#
# @ECLASS: kde4-meta.eclass
# @MAINTAINER:
@@ -16,13 +16,11 @@ inherit kde4-base versionator
EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_test src_install pkg_postinst pkg_postrm
-if [[ -z ${KMNAME} ]]; then
- die "kde4-meta.eclass inherited but KMNAME not defined - broken ebuild"
-fi
+[[ -z ${KMNAME} ]] && die "kde4-meta.eclass inherited but KMNAME not defined - broken ebuild"
# Add khelpcenter dependency when installing handbooks
if [[ ${PN} != khelpcenter ]] && has handbook ${IUSE//+}; then
- RDEPEND+=" handbook? ( $(add_kdebase_dep khelpcenter) )"
+ RDEPEND+=" handbook? ( $(add_kdebase_dep khelpcenter) )"
fi
# Add dependencies that all packages in a certain module share.
@@ -35,7 +33,7 @@ case ${KMNAME} in
case ${PN} in
akregator|kaddressbook|kjots|kmail|knode|knotes|korganizer|ktimetracker)
IUSE+=" +kontact"
- if ! slot_is_at_least 4.4 ${SLOT} || [[ ${SLOT} == 4.4 && ${PV} < 4.3.68 ]]; then
+ if ! slot_is_at_least 4.4 ${SLOT}; then
RDEPEND+=" kontact? ( $(add_kdebase_dep kontactinterfaces) )"
fi
;;
@@ -355,7 +353,7 @@ kde4-meta_create_extractlists() {
if has kontact ${IUSE//+} && use kontact; then
KMEXTRA+="
kontact/plugins/${PLUGINNAME:-${PN}}/"
- if ! slot_is_at_least 4.4 ${SLOT} || [[ ${SLOT} == 4.4 && ${PV} < 4.3.68 ]]; then
+ if ! slot_is_at_least 4.4 ${SLOT}; then
KMEXTRACTONLY+="
kontactinterfaces/"
fi
@@ -636,16 +634,22 @@ kde4-meta_change_cmakelists() {
kde4-meta_src_configure() {
debug-print-function ${FUNCNAME} "$@"
+ # backwards-compatibility: make mycmakeargs an array, if it isn't already
+ if [[ $(declare -p mycmakeargs) != "declare -a mycmakeargs="* ]]; then
+ mycmakeargs=(${mycmakeargs})
+ fi
+
# Set some cmake default values here (usually workarounds for automagic deps)
case ${KMNAME} in
kdewebdev)
- mycmakeargs="
+ mycmakeargs=(
-DWITH_KdepimLibs=OFF
-DWITH_LibXml2=OFF
-DWITH_LibXslt=OFF
-DWITH_Boost=OFF
-DWITH_LibTidy=OFF
- ${mycmakeargs}"
+ "${mycmakeargs[@]}"
+ )
;;
esac
@@ -664,12 +668,16 @@ kde4-meta_src_compile() {
# @FUNCTION: kde4-meta_src_test
# @DESCRIPTION:
-# Currently just calls its equivalent in kde4-base.eclass(5). Use this in split
-# ebuilds.
+# Currently just calls its equivalent in kde4-base.eclass(5) if
+# I_KNOW_WHAT_I_AM_DOING is set. Use this in split ebuilds.
kde4-meta_src_test() {
debug-print-function $FUNCNAME "$@"
- kde4-base_src_test
+ if [[ $I_KNOW_WHAT_I_AM_DOING ]]; then
+ kde4-base_src_test
+ else
+ einfo "Tests disabled"
+ fi
}
# @FUNCTION: kde4-meta_src_install