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 1QLtsV-0002xp-S0 for garchives@archives.gentoo.org; Mon, 16 May 2011 09:14:16 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C05461C102; Mon, 16 May 2011 09:14:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 904941C102 for ; Mon, 16 May 2011 09:14:07 +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 26AD51B4022 for ; Mon, 16 May 2011 09:14:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 24F127448A for ; Mon, 16 May 2011 09:14:06 +0000 (UTC) From: "Tomas Chvatal" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Tomas Chvatal" Message-ID: Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/kde4-base.eclass X-VCS-Directories: eclass/ X-VCS-Committer: scarabeus X-VCS-Committer-Name: Tomas Chvatal X-VCS-Revision: aeea62dc00600bfb31ded08a1a25b8dc2a6a8e45 Date: Mon, 16 May 2011 09:14:06 +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: 795c9d333733c1a21937429762634d15 commit: aeea62dc00600bfb31ded08a1a25b8dc2a6a8e45 Author: Tomas Chvatal gentoo org> AuthorDate: Mon May 16 09:13:52 2011 +0000 Commit: Tomas Chvatal gentoo org> CommitDate: Mon May 16 09:13:52 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3Daeea62dc [eclass] Drop WEBKIT_REQUIRED as the kdelibs itself require webkit to be = enabled. --- eclass/kde4-base.eclass | 44 ++++++++++++-----------------------------= --- 1 files changed, 12 insertions(+), 32 deletions(-) diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 76ec777..1fca73e 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -133,12 +133,6 @@ OPENGL_REQUIRED=3D"${OPENGL_REQUIRED:-never}" # This variable must be set before inheriting any eclasses. Defaults to = 'never'. MULTIMEDIA_REQUIRED=3D"${MULTIMEDIA_REQUIRED:-never}" =20 -# @ECLASS-VARIABLE: WEBKIT_REQUIRED -# @DESCRIPTION: -# Is qt-webkit requred? Possible values are 'always', 'optional' and 'ne= ver'. -# This variable must be set before inheriting any eclasses. Defaults to = 'never'. -WEBKIT_REQUIRED=3D"${WEBKIT_REQUIRED:-never}" - # @ECLASS-VARIABLE: CPPUNIT_REQUIRED # @DESCRIPTION: # Is cppunit required for tests? Possible values are 'always', 'optional= ' and 'never'. @@ -280,32 +274,6 @@ case ${MULTIMEDIA_REQUIRED} in esac unset qtmultimediadepend =20 -# WebKit dependencies -case ${KDE_REQUIRED} in - always) - qtwebkitusedeps=3D"[kde]" - ;; - optional) - qtwebkitusedeps=3D"[kde?]" - ;; - *) ;; -esac -qtwebkitdepend=3D" - >=3Dx11-libs/qt-webkit-${QT_MINIMAL}:4${qtwebkitusedeps} -" -unset qtwebkitusedeps -case ${WEBKIT_REQUIRED} in - always) - COMMONDEPEND+=3D" ${qtwebkitdepend}" - ;; - optional) - IUSE+=3D" webkit" - COMMONDEPEND+=3D" webkit? ( ${qtwebkitdepend} )" - ;; - *) ;; -esac -unset qtwebkitdepend - # CppUnit dependencies cppuintdepend=3D" dev-util/cppunit @@ -322,6 +290,17 @@ case ${CPPUNIT_REQUIRED} in esac unset cppuintdepend =20 + +# WebKit use dependencies +case ${KDE_REQUIRED} in + always) + qtwebkitusedeps=3D"[kde]" + ;; + optional) + qtwebkitusedeps=3D"[kde?]" + ;; + *) ;; +esac # KDE dependencies # Qt accessibility classes are needed in various places, bug 325461 kdecommondepend=3D" @@ -333,6 +312,7 @@ kdecommondepend=3D" >=3Dx11-libs/qt-sql-${QT_MINIMAL}:4[qt3support] >=3Dx11-libs/qt-svg-${QT_MINIMAL}:4 >=3Dx11-libs/qt-test-${QT_MINIMAL}:4 + >=3Dx11-libs/qt-webkit-${QT_MINIMAL}:4${qtwebkitusedeps} !aqua? ( x11-libs/libXext x11-libs/libXt