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 48F76138334 for ; Sat, 30 Jun 2018 08:45:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 55799E08DC; Sat, 30 Jun 2018 08:45:23 +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 0A509E08DC for ; Sat, 30 Jun 2018 08:45:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 C0599335C8C for ; Sat, 30 Jun 2018 08:45:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4795C36C for ; Sat, 30 Jun 2018 08:45:18 +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: <1530348302.b0c6bf7aaef17b9f7e5d2359cd0cc831b34f38a4.asturm@gentoo> Subject: [gentoo-commits] proj/kde-sunset:master commit in: eclass/ X-VCS-Repository: proj/kde-sunset X-VCS-Files: eclass/kde4-base.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: b0c6bf7aaef17b9f7e5d2359cd0cc831b34f38a4 X-VCS-Branch: master Date: Sat, 30 Jun 2018 08:45:18 +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: dfcdfc1a-2e35-42cc-8b3c-86db367b3c54 X-Archives-Hash: e5a20494b442294b71559c496a907c50 commit: b0c6bf7aaef17b9f7e5d2359cd0cc831b34f38a4 Author: Andreas Sturmlechner gmail com> AuthorDate: Sat Jun 30 08:23:04 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jun 30 08:45:02 2018 +0000 URL: https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=b0c6bf7a kde4-base.eclass: Remove kdelibs conditionals, no longer inherits kde4-base eclass/kde4-base.eclass | 46 ++++++++++++++++++++-------------------------- 1 file changed, 20 insertions(+), 26 deletions(-) diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 5a9a49c..d8e922e 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -360,25 +360,23 @@ kdecommondepend=" " unset qtcoreuse -if [[ ${PN} != kdelibs ]]; then - [[ -n ${kdelibsuse} ]] && kdelibsuse="[${kdelibsuse}]" - kdecommondepend+=" kde-frameworks/kdelibs:4${kdelibsuse}" - if [[ ${KDEBASE} = kdevelop ]]; then - if [[ ${PN} != kdevplatform ]]; then - # @ECLASS-VARIABLE: KDEVPLATFORM_REQUIRED - # @DESCRIPTION: - # Specifies whether kdevplatform is required. Possible values are 'always' (default) and 'never'. - # Applies to KDEBASE=kdevelop only. - KDEVPLATFORM_REQUIRED="${KDEVPLATFORM_REQUIRED:-always}" - case ${KDEVPLATFORM_REQUIRED} in - always) - kdecommondepend+=" - >=dev-util/kdevplatform-${KDEVPLATFORM_VERSION}:4 - " - ;; - *) ;; - esac - fi +[[ -n ${kdelibsuse} ]] && kdelibsuse="[${kdelibsuse}]" +kdecommondepend+=" kde-frameworks/kdelibs:4${kdelibsuse}" +if [[ ${KDEBASE} = kdevelop ]]; then + if [[ ${PN} != kdevplatform ]]; then + # @ECLASS-VARIABLE: KDEVPLATFORM_REQUIRED + # @DESCRIPTION: + # Specifies whether kdevplatform is required. Possible values are 'always' (default) and 'never'. + # Applies to KDEBASE=kdevelop only. + KDEVPLATFORM_REQUIRED="${KDEVPLATFORM_REQUIRED:-always}" + case ${KDEVPLATFORM_REQUIRED} in + always) + kdecommondepend+=" + >=dev-util/kdevplatform-${KDEVPLATFORM_VERSION}:4 + " + ;; + *) ;; + esac fi fi unset kdelibsuse @@ -421,12 +419,12 @@ kdehandbookrdepend=" case ${KDE_HANDBOOK} in always) kdedepend+=" ${kdehandbookdepend}" - [[ ${PN} != kdelibs ]] && kderdepend+=" ${kdehandbookrdepend}" + kderdepend+=" ${kdehandbookrdepend}" ;; optional) IUSE+=" +handbook" kdedepend+=" handbook? ( ${kdehandbookdepend} )" - [[ ${PN} != kdelibs ]] && kderdepend+=" handbook? ( ${kdehandbookrdepend} )" + kderdepend+=" handbook? ( ${kdehandbookrdepend} )" ;; *) ;; esac @@ -720,10 +718,9 @@ kde4-base_src_prepare() { # Enable/disable handbooks for kde4-base packages # kde4-l10n inherits kde4-base but is metapackage, so no check for doc - # kdelibs inherits kde4-base but handle installing the handbook itself if ! has kde4-meta ${INHERITED} && in_iuse handbook; then if [[ ${KDEBASE} == kde-base ]]; then - if [[ ${PN} != kde4-l10n && ${PN} != kdepim-l10n && ${PN} != kdelibs ]] && use !handbook; then + if [[ ${PN} != kde4-l10n && ${PN} != kdepim-l10n ]] && use !handbook; then # documentation in kde4-functions : ${KDE_DOC_DIRS:=doc} local dir @@ -786,9 +783,6 @@ kde4-base_src_configure() { append-cppflags -DQT_NO_DEBUG fi - # Set distribution name - [[ ${PN} = kdelibs ]] && cmakeargs+=(-DKDE_DISTRIBUTION_TEXT=Gentoo) - # Here we set the install prefix tc-is-cross-compiler || cmakeargs+=(-DCMAKE_INSTALL_PREFIX="${EPREFIX}${PREFIX}")