diff options
| -rw-r--r-- | eclass/kde4-base.eclass | 15 | ||||
| -rw-r--r-- | eclass/kde4-functions.eclass | 2 | ||||
| -rw-r--r-- | eclass/kde4-meta.eclass | 15 |
3 files changed, 23 insertions, 9 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 2cd562575a4..57cf375abe4 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -326,8 +326,12 @@ case ${BUILD_TYPE} in ESVN_REPO_URI="${ESVN_MIRROR}/${branch_prefix}/${PN}" ESVN_PROJECT="${PN}${ESVN_PROJECT_SUFFIX}" fi - # limit syncing to 1 hour. - ESVN_UP_FREQ=${ESVN_UP_FREQ:-1} + # @ECLASS-VARIABLE: ESVN_UP_FREQ + # @DESCRIPTION: + # This variable is used for specifying the timeout between svn synces + # for kde-base and koffice modules. Does not affect misc apps. + # Default value is 1 hour. + [[ ${KDEBASE} = kde-base || ${KDEBASE} = koffice ]] && ESVN_UP_FREQ=${ESVN_UP_FREQ:-1} ;; *) if [[ -n ${KDEBASE} ]]; then @@ -357,7 +361,12 @@ case ${BUILD_TYPE} in esac ;; koffice) - SRC_URI="mirror://kde/unstable/${_kmname_pv}/src/${_kmname_pv}.tar.bz2" + case ${PV} in + 1.9*) + SRC_URI="mirror://kde/unstable/${_kmname_pv}/src/${_kmname_pv}.tar.bz2" + ;; + *) SRC_URI="mirror://kde/stable/${_kmname_pv}/src/${_kmname_pv}.tar.bz2" ;; + esac ;; esac fi diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index ec54f67319c..ea87e69f8c4 100644 --- a/eclass/kde4-functions.eclass +++ b/eclass/kde4-functions.eclass @@ -106,7 +106,7 @@ comment_all_add_subdirectory() { # This is a whitespace-separated list of translations this ebuild supports. # These translations are automatically added to IUSE. Therefore ebuilds must set # this variable before inheriting any eclasses. To enable only selected -# translations, ebuilds must call enable_selected_linguas(). kde4-base.eclass does +# translations, ebuilds must call enable_selected_linguas(). kde4-{base,meta}.eclass does # this for you. # # Example: KDE_LINGUAS="en_GB de nl" diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index a5d597f85d6..05d7a1521a4 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -578,9 +578,14 @@ kde4-meta_change_cmakelists() { die "${LINENO}: sed died in the kdebase-startkde collision prevention section" fi # Strip EXPORT feature section from workspace for KDE4 versions > 4.1.82 + # install files separately as KDE4WorkspaceConfig-${PN}.cmake and + # strip duplicate definitions only. Libkworkspace is only special + # candidate that installs the desired file itself. if [[ ${PN} != libkworkspace ]]; then - sed -i -e '/install(FILES ${CMAKE_CURRENT_BINARY_DIR}\/KDE4WorkspaceConfig.cmake/,/^[[:space:]]*FILE KDE4WorkspaceLibraryTargets.cmake )[[:space:]]*^/d' \ - CMakeLists.txt || die "${LINENO}: sed died in kdebase-workspace strip EXPORT section" + sed -i \ + -e '/install(FILES[[:space:]]{CMAKE_CURRENT_BINARY_DIR}\/KDE4WorkspaceConfig.cmake/s/^/#DONOTINSTALL[[:space:]]/' + -e "s:FILE[[:space:]]KDE4WorkspaceLibraryTargets.cmake:FILE[[:space:]]KDE4WorkspaceLibraryTargets-${PN}.cmake:g" + CMakeLists.txt || die "${LINENO}: sed died in kdebase-workspace strip config install and fix EXPORT section" fi ;; kdebase-runtime) @@ -603,9 +608,9 @@ kde4-meta_change_cmakelists() { kdewebdev) # Disable hardcoded kdepimlibs check sed -e 's/find_package(KdepimLibs REQUIRED)/macro_optional_find_package(KdepimLibs)/' \ - -e 's/find_package(LibXml2 REQUIRED)/macro_optional_find_package(LibXml2 REQUIRED)/' \ - -e 's/find_package(LibXslt REQUIRED)/macro_optional_find_package(LibXslt REQUIRED)/' \ - -e 's/find_package(Boost REQUIRED)/macro_optional_find_package(Boost REQUIRED)/' \ + -e 's/find_package(LibXml2 REQUIRED)/macro_optional_find_package(LibXml2)/' \ + -e 's/find_package(LibXslt REQUIRED)/macro_optional_find_package(LibXslt)/' \ + -e 's/find_package(Boost REQUIRED)/macro_optional_find_package(Boost)/' \ -i CMakeLists.txt || die "failed to disable hardcoded checks" ;; koffice) |