From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 3C1321381F3 for ; Mon, 15 Apr 2013 07:48:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5ED87E08BD; Mon, 15 Apr 2013 07:48:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D698EE08BD for ; Mon, 15 Apr 2013 07:48:48 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BF7B633BE0E for ; Mon, 15 Apr 2013 07:48:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 5F0CDE433E for ; Mon, 15 Apr 2013 07:48:46 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1366012036.23642ac3b705f57b064d9e102f2ec4573f3399c3.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/kde4-base.eclass eclass/kde4-meta.eclass X-VCS-Directories: eclass/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 23642ac3b705f57b064d9e102f2ec4573f3399c3 X-VCS-Branch: master Date: Mon, 15 Apr 2013 07:48:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6087454b-6144-42f2-bcc2-274ca57b8864 X-Archives-Hash: e2e7ac9818aea0cc3ea59e8487167489 commit: 23642ac3b705f57b064d9e102f2ec4573f3399c3 Author: Michael Palimaka gentoo org> AuthorDate: Mon Apr 15 07:47:16 2013 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Mon Apr 15 07:47:16 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=23642ac3 [eclass] Disable global dependency checks for kde-workspace. Remove temporary dependencies added to work around this issue. --- eclass/kde4-base.eclass | 22 ---------------------- 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 3f6ee9d..ebcba74 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 063abbf..9027fae 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/" \