diff options
Diffstat (limited to 'eclass/kde4-functions.eclass')
| -rw-r--r-- | eclass/kde4-functions.eclass | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index 750c41a5cca..6d28ca05c43 100644 --- a/eclass/kde4-functions.eclass +++ b/eclass/kde4-functions.eclass @@ -39,6 +39,8 @@ KDE_SLOTS=( "kde-4" "4.1" "4.2" ) # @DESCRIPTION: # The slots used by all KDE live versions. KDE_LIVE_SLOTS=( "live" ) +<<<<<<< HEAD:eclass/kde4-functions.eclass +======= # @ECLASS-VARIABLE: KDE_DERIVATION_MAP # @DESCRIPTION: @@ -385,6 +387,7 @@ is-parent-package() { done <<< "$KDE_DERIVATION_MAP" return 1 } +>>>>>>> origin/4.2:eclass/kde4-functions.eclass # @FUNCTION: buildsycoca # @DESCRIPTION: @@ -560,3 +563,13 @@ kde4-functions_check_use() { die "Missing USE flags found" fi } +# @FUNCTION: kdebase_toplevel_cmakelists +# @DESCRIPTION: +# replace includes for live ebuilds with optional requests +kdebase_toplevel_cmakelist() { + insert=$(sed -e '/macro_optional_find_package/!d' < "${ESVN_WC_PATH}"/CMakeLists.txt) + at=$(sed -n '/^include[[:space:]]*(/=' < "${S}"/CMakeLists.txt | sed -n '$p') + for line in ${insert}; do + sed "${at}a${line}" -i "${S}"/CMakeLists.txt + done +} |