diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2013-04-15 17:47:16 +1000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2013-04-15 17:47:16 +1000 |
| commit | 23642ac3b705f57b064d9e102f2ec4573f3399c3 (patch) | |
| tree | 95654fe69a51ca04ee61dfe39ffcb68720a68e61 /eclass | |
| parent | [dev-util/cmake] Fix detection of newer imagemagic wrt bug #465898. Remove old. (diff) | |
| download | kde-23642ac3b705f57b064d9e102f2ec4573f3399c3.tar.gz kde-23642ac3b705f57b064d9e102f2ec4573f3399c3.tar.bz2 kde-23642ac3b705f57b064d9e102f2ec4573f3399c3.zip | |
[eclass] Disable global dependency checks for kde-workspace. Remove temporary dependencies added to work around this issue.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kde4-base.eclass | 22 | ||||
| -rw-r--r-- | eclass/kde4-meta.eclass | 11 |
2 files changed, 6 insertions, 27 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 3f6ee9dca6..ebcba7492b 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -376,28 +376,6 @@ case ${KDE_SELINUX_MODULE} in ;; esac -# These dependencies are added as they are unconditionally required by kde-workspace. -# They are not necessarily required by individual applications but are pulled in to prevent -# bugs like bug #444438. This list is subject to change in the future so do not rely on it -# in ebuilds - always set correct dependencies. -case ${KMNAME} in - kde-workspace) - kdedepend+=" - x11-libs/xcb-util - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXfixes - x11-libs/libxkbfile - x11-libs/libXrandr - x11-libs/libXrender - " - ;; - *) - ;; -esac - # We always need the aqua useflag because otherwise we cannot = refer to it inside # add_kdebase_dep. This was always kind of a bug, but came to light with EAPI=5 # (where referring to a use flag not in IUSE masks the ebuild). diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index 063abbf1dd..9027fae19d 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-workspace|kde-workspace|kdebase-runtime|kde-runtime|kdegraphics) + kdebase|kdebase-apps|kde-baseapps|kdebase-runtime|kde-runtime|kdegraphics) COMMONDEPEND+=" >=media-libs/qimageblitz-0.0.4" ;; kdepim|kdepim-runtime) @@ -297,7 +297,7 @@ kde4-meta_create_extractlists() { CTestConfig.cmake config-runtime.h.cmake" ;; - kdebase-workspace | kde-workspace) + kde-workspace) KMEXTRACTONLY+=" config-unix.h.cmake ConfigureChecks.cmake @@ -344,7 +344,7 @@ kde4-meta_create_extractlists() { && ! [[ ${KMNAME} == kdeedu && ( ${PV} == 4.6.4 || ${PV} == 4.6.5 ) ]] \ && ! [[ ${KMNAME} == kdegames && ${PV} > 4.9.0 ]]; then case ${KMNAME} in - kdebase-runtime|kde-runtime|kdebase-workspace|kde-workspace|kdeedu|kdegames|kdegraphics) + kdebase-runtime|kde-runtime|kde-workspace|kdeedu|kdegames|kdegraphics) KMEXTRACTONLY+=" cmake/modules/" ;; @@ -511,7 +511,7 @@ kde4-meta_change_cmakelists() { done case ${KMNAME} in - kdebase-workspace | kde-workspace) + kde-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. @@ -534,7 +534,8 @@ kde4-meta_change_cmakelists() { -i CMakeLists.txt || die "${LINENO}: sed died in kde-workspace dep reduction section" fi # >=KDE/4.11 - sed -e 's/TYPE REQUIRED/TYPE OPTIONAL/' -i CMakeLists.txt \ + sed -e 's/TYPE REQUIRED/TYPE OPTIONAL/' -e 's/XCB REQUIRED/XCB/' -e 's/X11 REQUIRED/X11/' \ + -e 's/message(FATAL_ERROR/message(/' -i CMakeLists.txt \ || die "${LINENO}: sed died in kde-workspace dep reduction section" if [[ "${PN}" != "kwin" ]]; then sed -i -e "/^ macro_log_feature(OPENGL_OR_ES_FOUND/s/TRUE/FALSE/" \ |