From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1JQ6YE-0001Ro-6Z for garchives@archives.gentoo.org; Fri, 15 Feb 2008 19:48:50 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 539DEE0772; Fri, 15 Feb 2008 19:48:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2E024E0772 for ; Fri, 15 Feb 2008 19:48:49 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id BA72664EF3 for ; Fri, 15 Feb 2008 19:48:48 +0000 (UTC) Received: from zlin by stork.gentoo.org with local (Exim 4.68) (envelope-from ) id 1JQ6Y5-0007Nz-F4 for gentoo-commits@lists.gentoo.org; Fri, 15 Feb 2008 19:48:41 +0000 From: "Bo Oersted Andresen (zlin)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, zlin@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: kde4-meta.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: kde4-meta.eclass X-VCS-Directories: eclass X-VCS-Committer: zlin X-VCS-Committer-Name: Bo Oersted Andresen Content-Type: text/plain; charset=utf8 Message-Id: Sender: Bo Oersted Andresen Date: Fri, 15 Feb 2008 19:48:41 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 123f7e4a-6387-4034-a71a-8b75e81f9cce X-Archives-Hash: 4ca12116cdb903bb43f388ab863383e8 zlin 08/02/15 19:48:41 Modified: kde4-meta.eclass Log: Remove qimageblitz dependency from kdeutils modules that don't use it. = Upstream already committed a fix to make it optional to trunk. Revision Changes Path 1.2 eclass/kde4-meta.eclass file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-meta.e= class?rev=3D1.2&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-meta.e= class?rev=3D1.2&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-meta.e= class?r1=3D1.1&r2=3D1.2 Index: kde4-meta.eclass =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kde4-meta.eclass 16 Jan 2008 22:51:47 -0000 1.1 +++ kde4-meta.eclass 15 Feb 2008 19:48:40 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.1 2008/01= /16 22:51:47 ingmar Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.2 2008/02= /15 19:48:40 zlin Exp $ # # @ECLASS: kde4-meta.eclass # @MAINTAINER: @@ -402,6 +402,16 @@ esac fi ;; + # This is sort of a hack to avoid patching 16 kdeutils packages with + # r775410 from upstream trunk which makes blitz optional so superkaram= ba + # only gets compiled when it is found. Bug #209324. Remove this no lat= er + # than 4.1. + kdeutils) + if [[ ${PN} !=3D superkaramba && ${SLOT} =3D=3D kde-4 ]]; then + sed -i -e '/find_package(Blitz REQUIRED)/d' "${S}"/CMakeLists.txt \ + || die "${LINENO}: sed to remove dependency on Blitz failed." + fi + ;; koffice) if [[ ${PN} !=3D koffice-libs ]]; then sed -i -e '/^INSTALL(FILES.*koffice.desktop/ s/^/#DONOTINSTALL /' \ --=20 gentoo-commits@lists.gentoo.org mailing list