diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kde4-base.eclass | 8 | ||||
| -rw-r--r-- | eclass/kde4-functions.eclass | 3 | ||||
| -rw-r--r-- | eclass/kde4-meta.eclass | 15 |
3 files changed, 4 insertions, 22 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index ebcba7492b5..7ca6d965677 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -420,13 +420,7 @@ _calculate_src_uri() { # calculate tarball module name if [[ -n ${KMNAME} ]]; then - # fixup kdebase-apps name - case ${KMNAME} in - kdebase-apps) - _kmname="kdebase" ;; - *) - _kmname="${KMNAME}" ;; - esac + _kmname="${KMNAME}" else _kmname=${PN} fi diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index 56baa760fc4..f8e51822ff2 100644 --- a/eclass/kde4-functions.eclass +++ b/eclass/kde4-functions.eclass @@ -62,9 +62,6 @@ if [[ ${KDE_BUILD_TYPE} == live ]]; then kdebase-runtime) EGIT_REPONAME=${EGIT_REPONAME:=kde-runtime} ;; - kdebase-apps) - EGIT_REPONAME=${EGIT_REPONAME:=kde-baseapps} - ;; esac fi diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index 9027fae19d5..1438ab2f147 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -24,7 +24,7 @@ EXPORT_FUNCTIONS ${KDEMETA_EXPF} # Add dependencies that all packages in a certain module share. case ${KMNAME} in - kdebase|kdebase-apps|kde-baseapps|kdebase-runtime|kde-runtime|kdegraphics) + kdebase|kde-baseapps|kdebase-runtime|kde-runtime|kdegraphics) COMMONDEPEND+=" >=media-libs/qimageblitz-0.0.4" ;; kdepim|kdepim-runtime) @@ -199,16 +199,7 @@ kde4-meta_src_extract() { KMTARPARAMS+=" --xz" fi - case ${KMNAME} in - kdebase-apps) - # kdebase/apps -> kdebase-apps - tarball="kdebase-${PV}.tar.${postfix}" - ;; - *) - # Create tarball name from module name (this is the default) - tarball="${KMNAME}-${PV}.tar.${postfix}" - ;; - esac + tarball="${KMNAME}-${PV}.tar.${postfix}" # Full path to source tarball tarfile="${DISTDIR}/${tarball}" @@ -286,7 +277,7 @@ kde4-meta_create_extractlists() { # Note that this actually doesn't include KMEXTRA handling. # In those cases you should care to add the relevant files to KMEXTRACTONLY case ${KMNAME} in - kdebase | kdebase-apps | kde-baseapps) + kdebase | kde-baseapps) KMEXTRACTONLY+=" CTestConfig.cmake config-apps.h.cmake |