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 A8279138334 for ; Mon, 4 Nov 2019 23:42:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 488DDE0A88; Mon, 4 Nov 2019 23:42:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 E452AE0A68 for ; Mon, 4 Nov 2019 23:42:38 +0000 (UTC) Received: from tuxbrain.localnet (91-115-217-203.adsl.highway.telekom.at [91.115.217.203]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: asturm) by smtp.gentoo.org (Postfix) with ESMTPSA id 508E134C8A5 for ; Mon, 4 Nov 2019 23:42:37 +0000 (UTC) From: Andreas Sturmlechner To: gentoo-dev@lists.gentoo.org Subject: [gentoo-dev] [PATCH 3/3] kde5-functions.eclass: Drop functions/vars moved to ecm-utils Date: Tue, 05 Nov 2019 00:42:28 +0100 Message-ID: <2311158.ytm2W4eR4P@tuxbrain> In-Reply-To: <1755325.gTJu0inKTA@tuxbrain> References: <9898161.uzqcMZjEFU@tuxk10> <2344877.D1iEJ5bPx9@tuxbrain> <1755325.gTJu0inKTA@tuxbrain> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Archives-Salt: 37609b0b-a20d-47a1-a976-7e8d277efedd X-Archives-Hash: 737ac51438164a1087521b611528a48c Functions moved to ecm-utils: - _check_gcc_version - punt_bogus_dep Variable moved to ecm-utils: - KDE_GCC_MINIMAL Deprecated: - _add_category_dep() - add_frameworks_dep() - add_plasma_dep() - add_kdeapps_dep() - add_qt_dep() --- a/eclass/kde5-functions.eclass +++ b/eclass/kde5-functions.eclass @@ -15,23 +15,11 @@ if [[ -z ${_KDE5_FUNCTIONS_ECLASS} ]]; then _KDE5_FUNCTIONS_ECLASS=1 -inherit toolchain-funcs - case ${EAPI} in 7) ;; *) die "EAPI=${EAPI:-0} is not supported" ;; esac -# @ECLASS-VARIABLE: KDE_BUILD_TYPE -# @DESCRIPTION: -# If PV matches "*9999*", this is automatically set to "live". -# Otherwise, this is automatically set to "release". -KDE_BUILD_TYPE="release" -if [[ ${PV} = *9999* ]]; then - KDE_BUILD_TYPE="live" -fi -export KDE_BUILD_TYPE - case ${CATEGORY} in kde-frameworks) [[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999} @@ -65,40 +53,6 @@ esac # Minimum version of KDE Applications to require. This affects add_kdeapps_dep. : ${KDE_APPS_MINIMAL:=19.04.3} -# @ECLASS-VARIABLE: KDE_GCC_MINIMAL -# @DEFAULT_UNSET -# @DESCRIPTION: -# Minimum version of active GCC to require. This is checked in kde5.eclass in -# kde5_pkg_pretend and kde5_pkg_setup. - -# @FUNCTION: _check_gcc_version -# @INTERNAL -# @DESCRIPTION: -# Determine if the current GCC version is acceptable, otherwise die. -_check_gcc_version() { - if [[ ${MERGE_TYPE} != binary && -v KDE_GCC_MINIMAL ]] && tc-is-gcc; then - - local version=$(gcc-version) - local major=${version%.*} - local minor=${version#*.} - local min_major=${KDE_GCC_MINIMAL%.*} - local min_minor=${KDE_GCC_MINIMAL#*.} - - debug-print "GCC version check activated" - debug-print "Version detected:" - debug-print " - Full: ${version}" - debug-print " - Major: ${major}" - debug-print " - Minor: ${minor}" - debug-print "Version required:" - debug-print " - Major: ${min_major}" - debug-print " - Minor: ${min_minor}" - - [[ ${major} -lt ${min_major} ]] || \ - ( [[ ${major} -eq ${min_major} && ${minor} -lt ${min_minor} ]] ) \ - && die "Sorry, but gcc-${KDE_GCC_MINIMAL} or later is required for this package (found ${version})." - fi -} - # @FUNCTION: _add_category_dep # @INTERNAL # @DESCRIPTION: @@ -143,6 +97,7 @@ _add_category_dep() { # The output of this should be added directly to DEPEND/RDEPEND, and may be # wrapped in a USE conditional (but not an || conditional without an extra set # of parentheses). +# PORTING: no replacement add_frameworks_dep() { debug-print-function ${FUNCNAME} "$@" @@ -175,6 +130,7 @@ add_frameworks_dep() { # The output of this should be added directly to DEPEND/RDEPEND, and may be # wrapped in a USE conditional (but not an || conditional without an extra set # of parentheses). +# PORTING: no replacement add_plasma_dep() { debug-print-function ${FUNCNAME} "$@" @@ -207,6 +163,7 @@ add_plasma_dep() { # The output of this should be added directly to DEPEND/RDEPEND, and may be # wrapped in a USE conditional (but not an || conditional without an extra set # of parentheses). +# PORTING: no replacement add_kdeapps_dep() { debug-print-function ${FUNCNAME} "$@" @@ -239,6 +196,7 @@ add_kdeapps_dep() { # The output of this should be added directly to DEPEND/RDEPEND, and may be # wrapped in a USE conditional (but not an || conditional without an extra set # of parentheses). +# PORTING: no replacement add_qt_dep() { debug-print-function ${FUNCNAME} "$@" @@ -263,6 +221,7 @@ add_qt_dep() { # @USAGE: # @DESCRIPTION: # Removes a specified dependency from a find_package call with multiple components. +# PORTING: Use ecm_punt_bogus_dep from ecm-utils.eclass instead. punt_bogus_dep() { local prefix=${1} local dep=${2}