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 861461381F3 for ; Thu, 15 Aug 2013 15:30:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 77B9FE0A69; Thu, 15 Aug 2013 15:30:01 +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 EA213E0A69 for ; Thu, 15 Aug 2013 15:30:00 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9344A33EB7E for ; Thu, 15 Aug 2013 15:29:59 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2323) id 30DCF2171C; Thu, 15 Aug 2013 15:29:58 +0000 (UTC) From: "Michael Palimaka (kensington)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, kensington@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kde4-base.eclass kde4-meta.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog kde4-base.eclass kde4-meta.eclass X-VCS-Directories: eclass X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20130815152958.30DCF2171C@flycatcher.gentoo.org> Date: Thu, 15 Aug 2013 15:29:58 +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: 7408744a-ca1e-4324-b133-e1c0aa84f414 X-Archives-Hash: 6aa1ccbbf608eabb8c86488cd7018cef kensington 13/08/15 15:29:58 Modified: ChangeLog kde4-base.eclass kde4-meta.eclass Log: Remove dependencies and actions that are now handled in individual ebuilds. Revision Changes Path 1.929 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.929&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.929&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.928&r2=1.929 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.928 retrieving revision 1.929 diff -u -r1.928 -r1.929 --- ChangeLog 15 Aug 2013 15:10:05 -0000 1.928 +++ ChangeLog 15 Aug 2013 15:29:58 -0000 1.929 @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.928 2013/08/15 15:10:05 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.929 2013/08/15 15:29:58 kensington Exp $ + + 15 Aug 2013; Michael Palimaka kde4-base.eclass, + kde4-meta.eclass: + Remove dependencies and actions that are now handled in individual ebuilds. 15 Aug 2013; Michael Palimaka kde4-base.eclass, kde4-functions.eclass, kde4-meta.eclass: 1.130 eclass/kde4-base.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.130&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.130&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.129&r2=1.130 Index: kde4-base.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v retrieving revision 1.129 retrieving revision 1.130 diff -u -r1.129 -r1.130 --- kde4-base.eclass 15 Aug 2013 15:10:05 -0000 1.129 +++ kde4-base.eclass 15 Aug 2013 15:29:58 -0000 1.130 @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.129 2013/08/15 15:10:05 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.130 2013/08/15 15:29:58 kensington Exp $ # @ECLASS: kde4-base.eclass # @MAINTAINER: @@ -378,28 +378,6 @@ ;; 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). 1.72 eclass/kde4-meta.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?rev=1.72&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?rev=1.72&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?r1=1.71&r2=1.72 Index: kde4-meta.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- kde4-meta.eclass 15 Aug 2013 15:10:05 -0000 1.71 +++ kde4-meta.eclass 15 Aug 2013 15:29:58 -0000 1.72 @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.71 2013/08/15 15:10:05 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.72 2013/08/15 15:29:58 kensington Exp $ # # @ECLASS: kde4-meta.eclass # @MAINTAINER: @@ -24,9 +24,6 @@ # 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) - COMMONDEPEND+=" >=media-libs/qimageblitz-0.0.4" - ;; kdepim|kdepim-runtime) case ${PN} in akregator|kaddressbook|kjots|kmail|knode|knotes|korganizer|ktimetracker) @@ -511,7 +508,7 @@ "${S}"/CMakeLists.txt || die "${LINENO}: sed died removing kde-workspace opengl dependency" fi ;; - kdebase-runtime | kde-runtime) + kde-runtime) # COLLISION PROTECT section # Only install the kde4 script as part of kde-base/kdebase-data if [[ ${PN} != kdebase-data && -f CMakeLists.txt ]]; then @@ -551,14 +548,6 @@ ;; esac ;; - kdewebdev) - # Disable hardcoded checks - sed -e 's/find_package(KdepimLibs REQUIRED)/macro_optional_find_package(KdepimLibs)/' \ - -e 's/find_package(LibXml2 REQUIRED)/macro_optional_find_package(LibXml2)/' \ - -e 's/find_package(LibXslt REQUIRED)/macro_optional_find_package(LibXslt)/' \ - -e 's/find_package(Boost REQUIRED)/macro_optional_find_package(Boost)/' \ - -i CMakeLists.txt || die "failed to disable hardcoded checks" - ;; esac popd > /dev/null @@ -571,25 +560,6 @@ kde4-meta_src_configure() { debug-print-function ${FUNCNAME} "$@" - # backwards-compatibility: make mycmakeargs an array, if it isn't already - if [[ $(declare -p mycmakeargs 2>&-) != "declare -a mycmakeargs="* ]]; then - mycmakeargs=(${mycmakeargs}) - fi - - # Set some cmake default values here (usually workarounds for automagic deps) - case ${KMNAME} in - kdewebdev) - mycmakeargs=( - -DWITH_KdepimLibs=OFF - -DWITH_LibXml2=OFF - -DWITH_LibXslt=OFF - -DWITH_Boost=OFF - -DWITH_LibTidy=OFF - "${mycmakeargs[@]}" - ) - ;; - esac - kde4-base_src_configure }