diff options
Diffstat (limited to 'eclass/trinity-meta.eclass')
| -rw-r--r-- | eclass/trinity-meta.eclass | 33 |
1 files changed, 27 insertions, 6 deletions
diff --git a/eclass/trinity-meta.eclass b/eclass/trinity-meta.eclass index 87f3b773..b6ddb073 100644 --- a/eclass/trinity-meta.eclass +++ b/eclass/trinity-meta.eclass @@ -16,13 +16,17 @@ HOMEPAGE="http://www.trinitydesktop.org/" set-trinityver [[ -z "$SLOT" ]] && SLOT="$TRINITY_VER" +if [[ "$TRINITY_VER" == "3.5" ]]; then # common dependencies -DEPEND="trinity-base/tdelibs:${SLOT}" + DEPEND="trinity-base/kdelibs:${SLOT}" +else + DEPEND="trinity-base/tdelibs:${SLOT}" +fi # @FUNCTION: trinity-meta_set_trinity_submodule # @DESCRIPTION: -# sets the TRINITY_SUBMODULE variable to nth value obtained from ${PN} -# if it isn't set yet +# sets the TRINITY_SUBMODULE variable to vth value aptained from ${PN} +# if it doesn't set yet trinity-meta_set_trinity_submodule() { debug-print-function $FUNCNAME "$@" @@ -45,12 +49,18 @@ trinity-meta_pkg_setup() { # @FUNCTION: trinity-meta_src_unpack # @DESCRIPTION: # Default source extract function. It tries to unpack only -# necessary files. +# nessecary files. trinity-meta_src_unpack() { debug-print-function ${FUNCNAME} "$@" if [[ ${BUILD_TYPE} = live ]]; then case "${TRINITY_SCM}" in + svn) + mkdir -p "$S" + ESVN_RESTRICT="export" subversion_src_unpack + subversion_wc_info + subversion_bootstrap + ;; git) git-2_src_unpack ;; @@ -72,7 +82,8 @@ trinity-meta_src_extract() { if [[ "${BUILD_TYPE}" = live ]]; then einfo "Exporting parts of working copy to ${S}" case "$TRINITY_SCM" in - git) # nothing we can do to prevent git from unpacking code + svn) trinity-meta_rsync_copy ;; + git) # we nothing can do to prevent git from unpacking code ;; *) die "TRINITY_SCM: ${TRINITY_SCM} is not supported by ${FUNCNAME}" esac @@ -116,6 +127,7 @@ trinity-meta_rsync_copy() { local rsync_options subdir targetdir wc_path escm case "${TRINITY_SCM}" in + svn) wc_path="${ESVN_WC_PATH}";; git) wc_path="${EGIT_STORE_DIR}/${EGIT_PROJECT}";; *) die "TRINITY_SCM: ${TRINITY_SCM} is not supported by ${FUNCNAME}" ;; esac @@ -155,8 +167,10 @@ trinity-meta_create_extractlists() { # add package-specific files and directories case "${TRINITY_MODULE_NAME}" in + kdebase) TSM_EXTRACT_LIST+=" kcontrol/ kdmlib/" ;; tdebase) TSM_EXTRACT_LIST+=" kcontrol/" ;; - *) ;; # nothing special for other modules + *) ;; # nothing special for over modules +# *) die "TRINITY_MODULE_NAME ${TRINITY_MODULE_NAME} is not supported by function ${FUNCNAME}" ;; esac TSM_EXTRACT_LIST+=" ${TSM_EXTRACT} ${TSM_EXTRACT_ALSO} cmake/ CMakeLists.txt" @@ -191,6 +205,13 @@ trinity-meta_src_prepare() { done; fi +# fix bad cmake code fo 3.5.13.1 + if [ $PV == "3.5.13.1" ]; then + [ -f "cmake/modules/FindTDE.cmake" ] && \ + sed -ie 's!HINTS\s\+${\w*BIN\w*}!HINTS "${TDE_PREFIX}/bin" ${BIN_INSTALL_DIR}!' \ + cmake/modules/FindTDE.cmake + fi + trinity-base_src_prepare } |