commit: e8abc75bee23ccd9a4822761ba1bb8c5abf87848 Author: Johannes Huber <johu <AT> gentoo <DOT> org> AuthorDate: Fri Apr 4 14:47:08 2014 +0000 Commit: Johannes Huber <johu <AT> gentoo <DOT> org> CommitDate: Fri Apr 4 14:51:39 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e8abc75b
[eclass] Remove add_frameworks_dep from kde4-functions eclass Was moved to kde5-functions eclass. --- eclass/kde4-functions.eclass | 41 ----------------------------------------- 1 file changed, 41 deletions(-) diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index 08d1ec6..b3284d9 100644 --- a/eclass/kde4-functions.eclass +++ b/eclass/kde4-functions.eclass @@ -39,9 +39,6 @@ esac if [[ ${CATEGORY} = kde-base ]]; then debug-print "${ECLASS}: KDEBASE ebuild recognized" KDEBASE=kde-base -elif [[ ${CATEGORY} = kde-frameworks ]]; then - debug-print "${ECLASS}: KDEFRAMEWORKS ebuild recognized" - KDEBASE=kde-frameworks elif [[ ${KMNAME-${PN}} = kdevelop ]]; then debug-print "${ECLASS}: KDEVELOP ebuild recognized" KDEBASE=kdevelop @@ -376,44 +373,6 @@ add_kdebase_dep() { echo " >=kde-base/${1}-${ver}:4[aqua=${2:+,${2}}]" } -# @FUNCTION: add_frameworks_dep -# @DESCRIPTION: -# Create proper dependency for kde-frameworks/ dependencies. -# This takes 1 to 3 arguments. The first being the package name, the optional -# second is additional USE flags to append, and the optional third is the -# version to use instead of the automatic version (use sparingly). -# 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). -add_frameworks_dep() { - debug-print-function ${FUNCNAME} "$@" - - local ver - - if [[ -n ${3} ]]; then - ver=${3} - elif [[ -n ${KDE_OVERRIDE_MINIMAL} ]]; then - ver=${KDE_OVERRIDE_MINIMAL} - elif [[ ${KDEBASE} != kde-frameworks && ${KDEBASE} != kde-base ]]; then - ver=${KDE_MINIMAL} - # if building stable-live version depend just on the raw KDE version - # to allow merging packages against more stable basic stuff - elif [[ ${PV} == *.9999 ]]; then - ver=$(get_kde_version) - else - ver=${PV} - fi - - [[ -z ${1} ]] && die "Missing parameter" - - local usedep= - if [[ -n ${2} ]] ; then - usedep="[${2}]" - fi - - echo " >=kde-frameworks/${1}-${ver}:5${usedep}" -} - # local function to enable specified translations for specified directory # used from kde4-functions_enable_selected_linguas function _enable_selected_linguas_dir() {