diff options
| -rw-r--r-- | eclass/kde4-base.eclass | 1 | ||||
| -rw-r--r-- | eclass/kde4-functions.eclass | 54 | ||||
| -rw-r--r-- | eclass/kde4-meta.eclass | 1 |
3 files changed, 0 insertions, 56 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 7ca6d965677..981e4d9c38d 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -621,7 +621,6 @@ kde4-base_src_unpack() { if [[ ${KDE_BUILD_TYPE} = live ]]; then case ${KDE_SCM} in svn) - migrate_store_dir subversion_src_unpack ;; git) diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index f8e51822ff2..351cf994d8a 100644 --- a/eclass/kde4-functions.eclass +++ b/eclass/kde4-functions.eclass @@ -218,60 +218,6 @@ enable_selected_doc_linguas() { [[ -n "${linguas}" ]] && einfo "Enabling handbook translations:${linguas}" } -# @FUNCTION: migrate_store_dir -# @DESCRIPTION: -# Universal store dir migration -# * performs split of kdebase to kdebase-apps when needed -# * moves playground/extragear kde4-base-style to toplevel dir -migrate_store_dir() { - if [[ ${KDE_SCM} != svn ]]; then - die "migrate_store_dir() only makes sense for subversion" - fi - - local cleandir="${ESVN_STORE_DIR}/KDE" - - if [[ -d ${cleandir} ]]; then - ewarn "'${cleandir}' has been found. Moving contents to new location." - addwrite "${ESVN_STORE_DIR}" - # Split kdebase - local module - if pushd "${cleandir}"/kdebase/kdebase > /dev/null; then - for module in `find . -maxdepth 1 -type d -name [a-z0-9]\*`; do - module="${module#./}" - mkdir -p "${ESVN_STORE_DIR}/kdebase-${module}" && mv -f "${module}" "${ESVN_STORE_DIR}/kdebase-${module}" || \ - die "Failed to move to '${ESVN_STORE_DIR}/kdebase-${module}'." - done - popd > /dev/null - rm -fr "${cleandir}/kdebase" || \ - die "Failed to remove ${cleandir}/kdebase. You need to remove it manually." - fi - # Move the rest - local pkg - for pkg in "${cleandir}"/*; do - mv -f "${pkg}" "${ESVN_STORE_DIR}"/ || eerror "Failed to move '${pkg}'" - done - rmdir "${cleandir}" || die "Could not move obsolete KDE store dir. Please move '${cleandir}' contents to appropriate location (possibly ${ESVN_STORE_DIR}) and manually remove '${cleandir}' in order to continue." - fi - - if ! has kde4-meta ${INHERITED}; then - case ${KMNAME} in - extragear*|playground*) - local scmlocalpath="${ESVN_STORE_DIR}"/"${KMNAME}"/"${PN}" - if [[ -d "${scmlocalpath}" ]]; then - local destdir="${ESVN_STORE_DIR}"/"${ESVN_PROJECT}"/"`basename "${ESVN_REPO_URI}"`" - ewarn "'${scmlocalpath}' has been found." - ewarn "Moving contents to new location: ${destdir}" - addwrite "${ESVN_STORE_DIR}" - mkdir -p "${ESVN_STORE_DIR}"/"${ESVN_PROJECT}" && mv -f "${scmlocalpath}" "${destdir}" \ - || die "Failed to move to '${scmlocalpath}'" - # Try cleaning empty directories - rmdir "`dirname "${scmlocalpath}"`" 2> /dev/null - fi - ;; - esac - fi -} - # Functions handling KMLOADLIBS and KMSAVELIBS # @FUNCTION: save_library_dependencies diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index 1438ab2f147..c13b1a49a37 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -131,7 +131,6 @@ kde4-meta_src_unpack() { if [[ ${KDE_BUILD_TYPE} = live ]]; then case "${KDE_SCM}" in svn) - migrate_store_dir S="${WORKDIR}/${P}" mkdir -p "${S}" ESVN_RESTRICT="export" subversion_src_unpack |