diff options
| -rw-r--r-- | eclass/kde4-base.eclass | 1 | ||||
| -rw-r--r-- | eclass/kde4-functions.eclass | 4 | ||||
| -rw-r--r-- | eclass/kde4-meta.eclass | 60 |
3 files changed, 5 insertions, 60 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index a2ffb24564d..cb868778442 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -33,7 +33,6 @@ if [[ ${BUILD_TYPE} = live ]]; then case ${KDE_SCM} in svn) inherit subversion ;; git) inherit git ;; - *) die "KDE_SCM: ${KDE_SCM} is not supported" ;; esac fi diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index 565013f3911..9190d916c25 100644 --- a/eclass/kde4-functions.eclass +++ b/eclass/kde4-functions.eclass @@ -40,6 +40,10 @@ fi # @DESCRIPTION: # If this is a live package which scm does it use KDE_SCM="${KDE_SCM:-svn}" +case ${KDE_SCM} in + svn|git) ;; + *) die "KDE_SCM: ${KDE_SCM} is not supported" ;; +esac # @ECLASS-VARIABLE: KDE_SLOTS # @DESCRIPTION: diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index 64dd1e80d12..3fc7bedab76 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -77,14 +77,6 @@ case ${BUILD_TYPE} in ESVN_PROJECT="${KMNAME}${ESVN_PROJECT_SUFFIX}" ;; esac - elif [[ "${KDE_SCM}" == "git" ]]; then - case ${KMNAME} in - kdepim) - EGIT_REPO_URI="git://anongit.kde.org/${KMNAME}" - ;; - esac - - fi ;; esac @@ -214,12 +206,7 @@ kde4-meta_src_extract() { || die "${escm}: can't export subdirectory '${subdir}' to '${S}/${targetdir}'." done ;; - - git) - : noop - ;; - *) - die "Unknown value for KDE_SCM in kde4-meta_src_extract(): ${KDE_SCM}" + *) ;; esac if [[ ${KMNAME} = kdebase-runtime && ${PN} != kdebase-data ]]; then @@ -392,14 +379,6 @@ kde4-meta_create_extractlists() { filters/config-filters.h.cmake " case ${PV} in - 2.0.*) - KMEXTRACTONLY+=" - config-openctl.h.cmake - config-endian.h.cmake - config-openexr.h.cmake - config-opengl.h.cmake - config-prefix.h.cmake" - ;; 2.[12].*) KMEXTRACTONLY+=" config-endian.h.cmake @@ -645,31 +624,6 @@ kde4-meta_change_cmakelists() { sed -e '/install(.\+config-openexr\.h.\+)/d' \ -i CMakeLists.txt || die "${LINENO}: sed died in collision prevention section" fi - # koffice 2.0 - case ${PV} in - 2.0.[1-9]) - sed -i -n -e '1h;1!H;${g;s/install(.\+config-openexr.h.\+)//;p}' \ - "${S}"/CMakeLists.txt || \ - die "${LINENO}: sed died in collision prevention section" - ;; - *) ;; - esac - # koffice 2.1.[8-9][0-9] and 9999 - case ${PV} in - 2.1.8[0-9]|2.1.9[0-9]|9999) - sed -e '/^option(BUILD/s/ON/OFF/' \ - -e '/^if(NOT BUILD_kchart/,/^endif(NOT BUILD_kchart/d' \ - -e '/^if(BUILD_koreport/,/^endif(BUILD_koreport/d' \ - -e 's/set(SHOULD_BUILD_F_OFFICE TRUE)/set(SHOULD_BUILD_F_OFFICE FALSE)/' \ - -i "${S}"/CMakeLists.txt || die "sed died while fixing cmakelists" - if [[ ${PN} != koffice-data ]] && [[ ${PV} == 9999 ]]; then - sed -e '/config-opengl.h/d' \ - -i "${S}"/CMakeLists.txt || die "sed died while fixing cmakelists" - - fi - ;; - *) ;; - esac esac popd > /dev/null @@ -699,18 +653,6 @@ kde4-meta_src_configure() { "${mycmakeargs[@]}" ) ;; - koffice) - case ${PV} in - 2.1.8[0-9]|2.1.9[0-9]|9999) - if [[ ${PN} != "kchart" ]]; then - mycmakeargs=( - -DBUILD_koreport=OFF - "${mycmakeargs[@]}" - ) - fi - ;; - esac - ;; esac kde4-base_src_configure |