From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Q6Wjb-0005MR-Ko for garchives@archives.gentoo.org; Sun, 03 Apr 2011 23:29:31 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 074B81C009; Sun, 3 Apr 2011 23:29:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C5FCA1C009 for ; Sun, 3 Apr 2011 23:29:22 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 551061B404A for ; Sun, 3 Apr 2011 23:29:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 82E2680065 for ; Sun, 3 Apr 2011 23:29:21 +0000 (UTC) From: "Jonathan Callen" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jonathan Callen" Message-ID: Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/kde4-meta.eclass X-VCS-Directories: eclass/ X-VCS-Committer: abcd X-VCS-Committer-Name: Jonathan Callen X-VCS-Revision: fced2c53d4d8927982773e263e5443c2dd7733d5 Date: Sun, 3 Apr 2011 23:29:21 +0000 (UTC) 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: X-Archives-Hash: 21a4896c9c9e0bfe33678b1ca0d9ef2e commit: fced2c53d4d8927982773e263e5443c2dd7733d5 Author: abcd gentoo org> AuthorDate: Sun Apr 3 23:29:00 2011 +0000 Commit: Jonathan Callen gentoo org> CommitDate: Sun Apr 3 23:29:00 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3Dfced2c53 [eclass] kdegraphics >=3D 4.6.2 doesn't have cmake/ either --- eclass/kde4-meta.eclass | 33 +++++++++++++++++---------------- 1 files changed, 17 insertions(+), 16 deletions(-) diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index 85ed4eb..24c8921 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -408,23 +408,24 @@ kde4-meta_create_extractlists() { ;; esac # Don't install cmake modules for split ebuilds, to avoid collisions. - # note: kdegraphics-4.6.2 does not even have code to do that, so we + # note: kdegraphics >=3D 4.6.2 does not even have code to do that, so w= e # should not try in that case - ( [[ ${KMNAME} =3D=3D kdegraphics ]] && [[ ${PV} =3D=3D "4.6.2" ]] ) || - case ${KMNAME} in - kdebase-runtime|kdebase-workspace|kdeedu|kdegames|kdegraphics) - case ${PN} in - libkdegames|libkdeedu|libkworkspace) - KMEXTRA+=3D" - cmake/modules/" - ;; - *) - KMCOMPILEONLY+=3D" - cmake/modules/" - ;; - esac - ;; - esac + if [[ ${KMNAME} !=3D kdegraphics ]] || { [[ ${SLOT} !=3D 4.6 || ${PV} <= 4.6.2 ]] && ! slot_is_at_least 4.7 ${SLOT}; }; then + case ${KMNAME} in + kdebase-runtime|kdebase-workspace|kdeedu|kdegames|kdegraphics) + case ${PN} in + libkdegames|libkdeedu|libkworkspace) + KMEXTRA+=3D" + cmake/modules/" + ;; + *) + KMCOMPILEONLY+=3D" + cmake/modules/" + ;; + esac + ;; + esac + fi =20 debug-print "line ${LINENO} ${ECLASS} ${FUNCNAME}: KMEXTRACTONLY ${KMEX= TRACTONLY}" }