diff options
| -rw-r--r-- | eclass/kde4-functions.eclass | 60 | ||||
| -rw-r--r-- | eclass/kde4-meta.eclass | 9 |
2 files changed, 31 insertions, 38 deletions
diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index bc9f03f9235..60ca3ab1929 100644 --- a/eclass/kde4-functions.eclass +++ b/eclass/kde4-functions.eclass @@ -45,37 +45,6 @@ elif [[ ${KMNAME-${PN}} = kdevelop ]]; then KDEBASE=kdevelop fi -# @ECLASS-VARIABLE: KDE_SCM -# @DESCRIPTION: -# If this is a live package which scm does it use - -# Set reponame and SCM for moduleses that have fully migrated to git -case ${PV} in - 9999*) - case "${KMNAME}" in - kdebase-workspace) - KDE_SCM="git" - ESCM_REPONAME=${ESCM_REPONAME:=kde-workspace} - ;; - kdebase-runtime) - KDE_SCM="git" - ESCM_REPONAME=${ESCM_REPONAME:=kde-runtime} - ;; - kdebase-apps) - KDE_SCM="git" - ESCM_REPONAME=${ESCM_REPONAME:=kde-baseapps} - ;; - esac - ;; -esac - -# Everything else uses svn by default -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: # The slots used by all KDE versions later than 4.0. The live KDE releases use @@ -95,6 +64,35 @@ else fi export BUILD_TYPE +# Set reponame and SCM for moduleses that have fully migrated to git +# (hack - it's here because it needs to be before SCM inherits from kde4-base) +if [[ ${BUILD_TYPE} == live ]]; then + case "${KMNAME}" in + kdebase-workspace) + KDE_SCM="git" + ESCM_REPONAME=${ESCM_REPONAME:=kde-workspace} + ;; + kdebase-runtime) + KDE_SCM="git" + ESCM_REPONAME=${ESCM_REPONAME:=kde-runtime} + ;; + kdebase-apps) + KDE_SCM="git" + ESCM_REPONAME=${ESCM_REPONAME:=kde-baseapps} + ;; + esac +fi + +# @ECLASS-VARIABLE: KDE_SCM +# @DESCRIPTION: +# If this is a live package which scm does it use +# Everything else uses svn by default +KDE_SCM="${KDE_SCM:-svn}" +case ${KDE_SCM} in + svn|git) ;; + *) die "KDE_SCM: ${KDE_SCM} is not supported" ;; +esac + # @ECLASS-VARIABLE: KDE_LINGUAS # @DESCRIPTION: # This is a whitespace-separated list of translations this ebuild supports. diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index 349aa4d5ece..65e28cf0f62 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -12,12 +12,12 @@ # You must define KMNAME to use this eclass, and do so before inheriting it. All other variables are optional. # Do not include the same item in more than one of KMMODULE, KMMEXTRA, KMCOMPILEONLY, KMEXTRACTONLY. +[[ -z ${KMNAME} ]] && die "kde4-meta.eclass inherited but KMNAME not defined - broken ebuild" + inherit kde4-base versionator EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_test src_install pkg_postinst pkg_postrm -[[ -z ${KMNAME} ]] && die "kde4-meta.eclass inherited but KMNAME not defined - broken ebuild" - # Add dependencies that all packages in a certain module share. case ${KMNAME} in kdebase|kdebase-apps|kdebase-workspace|kdebase-runtime|kdegraphics) @@ -206,11 +206,6 @@ kde4-meta_src_extract() { done ;; esac - - if [[ ${KMNAME} = kdebase-runtime && ${PN} != kdebase-data ]]; then - sed -i -e '/^install(PROGRAMS[[:space:]]*[^[:space:]]*\/kde4[[:space:]]/s/^/#DONOTINSTALL /' \ - "${S}"/CMakeLists.txt || die "Sed to exclude bin/kde4 failed" - fi else local abort tarball tarfile f extractlist moduleprefix postfix |