diff options
Diffstat (limited to 'eclass/kde4-meta.eclass')
| -rw-r--r-- | eclass/kde4-meta.eclass | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index cacbbaa2df4..349aa4d5ece 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -20,7 +20,7 @@ EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_ # Add dependencies that all packages in a certain module share. case ${KMNAME} in - kdebase|kdebase-apps|kdebase-workspace|kde-workspace|kdebase-runtime|kde-runtime|kdegraphics) + kdebase|kdebase-apps|kdebase-workspace|kdebase-runtime|kdegraphics) COMMONDEPEND+=" >=media-libs/qimageblitz-0.0.4" ;; kdepim|kdepim-runtime) @@ -206,6 +206,11 @@ 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 @@ -220,14 +225,6 @@ kde4-meta_src_extract() { moduleprefix=apps/ KMTARPARAMS+=" --transform=s|apps/||" ;; - kde-runtime) - # Old tarball naming scheme - tarball="kdebase-runtime-${PV}.tar.${postfix}" - ;; - kde-workspace) - # Old tarball naming scheme - tarball="kdebase-workspace-${PV}.tar.${postfix}" - ;; *) # Create tarball name from module name (this is the default) tarball="${KMNAME}-${PV}.tar.${postfix}" @@ -327,11 +324,11 @@ kde4-meta_create_extractlists() { config-apps.h.cmake ConfigureChecks.cmake" ;; - kdebase-runtime|kde-runtime) + kdebase-runtime) KMEXTRACTONLY+=" config-runtime.h.cmake" ;; - kdebase-workspace|kde-workspace) + kdebase-workspace) KMEXTRACTONLY+=" config-unix.h.cmake ConfigureChecks.cmake @@ -389,7 +386,7 @@ kde4-meta_create_extractlists() { esac # Don't install cmake modules for split ebuilds, to avoid collisions. case ${KMNAME} in - kdebase-runtime|kde-runtime|kdebase-workspace|kde-workspace|kdeedu|kdegames|kdegraphics) + kdebase-runtime|kdebase-workspace|kdeedu|kdegames|kdegraphics) case ${PN} in libkdegames|libkdeedu|libkworkspace) KMEXTRA+=" @@ -553,7 +550,7 @@ kde4-meta_change_cmakelists() { done case ${KMNAME} in - kdebase-workspace|kde-workspace) + kdebase-workspace) # COLLISION PROTECT section # Install the startkde script just once, as a part of kde-base/kdebase-startkde, # not as a part of every package. @@ -565,10 +562,10 @@ kde4-meta_change_cmakelists() { # Strip EXPORT feature section from workspace for KDE4 versions > 4.1.82 if [[ ${PN} != libkworkspace ]]; then sed -e '/install(FILES ${CMAKE_CURRENT_BINARY_DIR}\/KDE4WorkspaceConfig.cmake/,/^[[:space:]]*FILE KDE4WorkspaceLibraryTargets.cmake )[[:space:]]*^/d' \ - -i CMakeLists.txt || die "${LINENO}: sed died in ${KMNAME} strip config install and fix EXPORT section" + -i CMakeLists.txt || die "${LINENO}: sed died in kdebase-workspace strip config install and fix EXPORT section" fi ;; - kdebase-runtime|kde-runtime) + kdebase-runtime) # COLLISION PROTECT section # Only install the kde4 script as part of kde-base/kdebase-data if [[ ${PN} != kdebase-data && -f CMakeLists.txt ]]; then |