From b284a3168fa91a038925d2ecf5e4791011ea5e7d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 18 Nov 2019 10:15:03 +0000 Subject: gentoo resync : 18.11.2019 --- eclass/kde5-functions.eclass | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'eclass/kde5-functions.eclass') diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass index 652ed06b7be5..7bf5a9caa33f 100644 --- a/eclass/kde5-functions.eclass +++ b/eclass/kde5-functions.eclass @@ -10,7 +10,7 @@ # This eclass contains functions shared by the other KDE eclasses and forms # part of their public API. # -# This eclass should (almost) never be inherited directly by an ebuild. +# This eclass must not be inherited directly by an ebuild. if [[ -z ${_KDE5_FUNCTIONS_ECLASS} ]]; then _KDE5_FUNCTIONS_ECLASS=1 @@ -32,16 +32,6 @@ if [[ ${PV} = *9999* ]]; then fi export KDE_BUILD_TYPE -case ${CATEGORY} in - kde-frameworks) - [[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999} - ;; - kde-plasma) - [[ ${PV} = 5.17* ]] && : ${FRAMEWORKS_MINIMAL:=5.63.0} - [[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999} - ;; -esac - # @ECLASS-VARIABLE: QT_MINIMAL # @DESCRIPTION: # Minimum version of Qt to require. This affects add_qt_dep. @@ -140,6 +130,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} "$@" @@ -172,6 +163,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} "$@" @@ -204,6 +196,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} "$@" @@ -236,6 +229,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} "$@" @@ -260,6 +254,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.eclass instead. punt_bogus_dep() { local prefix=${1} local dep=${2} -- cgit v1.2.3