From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D1E1E1396D0 for ; Tue, 15 Aug 2017 09:36:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2F8421FC05E; Tue, 15 Aug 2017 09:36:32 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F2A551FC05E for ; Tue, 15 Aug 2017 09:36:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D7DD034172E for ; Tue, 15 Aug 2017 09:36:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4F6FF7843 for ; Tue, 15 Aug 2017 09:36:29 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1502789529.9b9845280c6ddb659ea2d2a88c022bca053347e5.asturm@gentoo> 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: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 9b9845280c6ddb659ea2d2a88c022bca053347e5 X-VCS-Branch: master Date: Tue, 15 Aug 2017 09:36:29 +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: 450277d9-8e1a-40f7-a4a5-33899cee2a03 X-Archives-Hash: 10fd6b44391e813917c8730740df6f8c commit: 9b9845280c6ddb659ea2d2a88c022bca053347e5 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Aug 6 15:52:44 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Aug 15 09:32:09 2017 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=9b984528 kde4-base.eclass: Add {QT3SUPPORT,SQL}_REQUIRED, drop designer:4 dep This makes dev-qt/qtsql:4 and dev-qt/qt3support:4 optional. eclass/kde4-base.eclass | 66 ++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 54 insertions(+), 12 deletions(-) diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 9e425733f9..78bceb12ed 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -112,6 +112,12 @@ unset export_fns # This variable must be set before inheriting any eclasses. Defaults to 'never'. DECLARATIVE_REQUIRED="${DECLARATIVE_REQUIRED:-never}" +# @ECLASS-VARIABLE: QT3SUPPORT_REQUIRED +# @DESCRIPTION: +# Is qt3support required? Possible values are 'true' or 'false'. +# This variable must be set before inheriting any eclasses. Defaults to 'false'. +QT3SUPPORT_REQUIRED="${QT3SUPPORT_REQUIRED:-false}" + # @ECLASS-VARIABLE: QTHELP_REQUIRED # @DESCRIPTION: # Is qthelp required? Possible values are 'always', 'optional' and 'never'. @@ -130,6 +136,12 @@ OPENGL_REQUIRED="${OPENGL_REQUIRED:-never}" # This variable must be set before inheriting any eclasses. Defaults to 'never'. MULTIMEDIA_REQUIRED="${MULTIMEDIA_REQUIRED:-never}" +# @ECLASS-VARIABLE: SQL_REQUIRED +# @DESCRIPTION: +# Is qtsql required? Possible values are 'always', 'optional' and 'never'. +# This variable must be set before inheriting any eclasses. Defaults to 'never'. +SQL_REQUIRED="${SQL_REQUIRED:-never}" + # @ECLASS-VARIABLE: WEBKIT_REQUIRED # @DESCRIPTION: # Is qtwebkit required? Possible values are 'always', 'optional' and 'never'. @@ -224,6 +236,21 @@ case ${DECLARATIVE_REQUIRED} in esac unset qtdeclarativedepend +# Qt3Support dependencies +qt3supportdepend=" + >=dev-qt/qt3support-${QT_MINIMAL}:4[accessibility] +" +case ${QT3SUPPORT_REQUIRED} in + true) + COMMONDEPEND+=" ${qt3supportdepend}" + [[ -n ${qtcoreuse} ]] && qtcoreuse+=",qt3support" || qtcoreuse="qt3support" + [[ -n ${qtsqluse} ]] && qtsqluse+=",qt3support" || qtsqluse="qt3support" + [[ -n ${kdelibsuse} ]] && kdelibsuse+=",qt3support(+)" || kdelibsuse="qt3support(+)" + ;; + *) ;; +esac +unset qt3supportdepend + # QtHelp dependencies qthelpdepend=" >=dev-qt/qthelp-${QT_MINIMAL}:4 @@ -271,6 +298,24 @@ case ${MULTIMEDIA_REQUIRED} in esac unset qtmultimediadepend +# Sql dependencies +[[ -n ${qtsqluse} ]] && qtsqluse="[${qtsqluse}]" +qtsqldepend=" + >=dev-qt/qtsql-${QT_MINIMAL}:4${qtsqluse} +" +case ${SQL_REQUIRED} in + always) + COMMONDEPEND+=" ${qtsqldepend}" + ;; + optional) + IUSE+=" sql" + COMMONDEPEND+=" sql? ( ${qtsqldepend} )" + ;; + *) ;; +esac +unset qtsqluse +unset qtsqldepend + # WebKit dependencies qtwebkitdepend=" >=dev-qt/qtwebkit-${QT_MINIMAL}:4 @@ -278,10 +323,12 @@ qtwebkitdepend=" case ${WEBKIT_REQUIRED} in always) COMMONDEPEND+=" ${qtwebkitdepend}" + [[ -n ${kdelibsuse} ]] && kdelibsuse+=",webkit(+)" || kdelibsuse="webkit(+)" ;; optional) IUSE+=" +webkit" COMMONDEPEND+=" webkit? ( ${qtwebkitdepend} )" + [[ -n ${kdelibsuse} ]] && kdelibsuse+=",webkit?" || kdelibsuse="webkit?" ;; *) ;; esac @@ -305,28 +352,22 @@ unset cppuintdepend # KDE dependencies # Qt accessibility classes are needed in various places, bug 325461 +[[ -n ${qtcoreuse} ]] && qtcoreuse+=",ssl" || qtcoreuse="ssl" +[[ -n ${qtcoreuse} ]] && qtcoreuse="[${qtcoreuse}]" kdecommondepend=" dev-lang/perl - >=dev-qt/qt3support-${QT_MINIMAL}:4[accessibility] - >=dev-qt/qtcore-${QT_MINIMAL}:4[qt3support,ssl] + >=dev-qt/qtcore-${QT_MINIMAL}:4${qtcoreuse} >=dev-qt/qtdbus-${QT_MINIMAL}:4 - >=dev-qt/designer-${QT_MINIMAL}:4 >=dev-qt/qtgui-${QT_MINIMAL}:4[accessibility,dbus(+)] >=dev-qt/qtscript-${QT_MINIMAL}:4 - >=dev-qt/qtsql-${QT_MINIMAL}:4[qt3support] >=dev-qt/qtsvg-${QT_MINIMAL}:4 >=dev-qt/qttest-${QT_MINIMAL}:4 " +unset qtcoreuse if [[ ${PN} != kdelibs ]]; then - local _kdelibsuse - case ${WEBKIT_REQUIRED} in - always) _kdelibsuse="[webkit]" ;; - optional) _kdelibsuse="[webkit?]" ;; - *) ;; - esac - kdecommondepend+=" >=kde-frameworks/kdelibs-4.14.22:4${_kdelibsuse}" - unset _kdelibsuse + [[ -n ${kdelibsuse} ]] && kdelibsuse="[${kdelibsuse}]" + kdecommondepend+=" kde-frameworks/kdelibs:4${kdelibsuse}" if [[ ${KDEBASE} = kdevelop ]]; then if [[ ${PN} != kdevplatform ]]; then # @ECLASS-VARIABLE: KDEVPLATFORM_REQUIRED @@ -345,6 +386,7 @@ if [[ ${PN} != kdelibs ]]; then fi fi fi +unset kdelibsuse kdedepend=" dev-util/automoc