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 90C46138334 for ; Fri, 16 Aug 2019 14:52:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B0EF4E0BF0; Fri, 16 Aug 2019 14:52:39 +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 8747CE0BF0 for ; Fri, 16 Aug 2019 14:52:39 +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 77379349C5B for ; Fri, 16 Aug 2019 14:52:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5A867762 for ; Fri, 16 Aug 2019 14:52:36 +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: <1565967107.e0238ccd9b535aab8ab222c8a68b34773a9299fd.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/kde5-functions.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: e0238ccd9b535aab8ab222c8a68b34773a9299fd X-VCS-Branch: master Date: Fri, 16 Aug 2019 14:52:36 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5ff34b3b-a9ec-4b32-a7e7-c0039ebe551c X-Archives-Hash: 8bda35368ddcb346766bebc409a8fcf2 commit: e0238ccd9b535aab8ab222c8a68b34773a9299fd Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Aug 14 14:48:48 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Aug 16 14:51:47 2019 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=e0238ccd kde5-functions.eclass: Drop EAPI-6 support Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/kde5-functions.eclass | 48 +------------------------------------------- 1 file changed, 1 insertion(+), 47 deletions(-) diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass index 56aafd7eb6..e495fb8059 100644 --- a/eclass/kde5-functions.eclass +++ b/eclass/kde5-functions.eclass @@ -4,7 +4,7 @@ # @ECLASS: kde5-functions.eclass # @MAINTAINER: # kde@gentoo.org -# @SUPPORTED_EAPIS: 6 7 +# @SUPPORTED_EAPIS: 7 # @BLURB: Common ebuild functions for packages based on KDE Frameworks 5. # @DESCRIPTION: # This eclass contains functions shared by the other KDE eclasses and forms @@ -19,7 +19,6 @@ inherit toolchain-funcs case ${EAPI} in 7) ;; - 6) inherit eapi7-ver ;; *) die "EAPI=${EAPI:-0} is not supported" ;; esac @@ -249,10 +248,6 @@ add_qt_dep() { if [[ -z ${version} ]]; then version=${QT_MINIMAL} - if [[ ${1} = qtwebkit ]]; then - version=5.9.1 - [[ ${EAPI} != 6 ]] && die "${FUNCNAME} is disallowed for 'qtwebkit' in EAPI 7 and later" - fi fi if [[ -z ${slot} ]]; then slot="5" @@ -261,47 +256,6 @@ add_qt_dep() { _add_category_dep dev-qt "${1}" "${2}" "${version}" "${slot}" } -# @FUNCTION: get_kde_version [version] -# @DESCRIPTION: -# Translates an ebuild version into a major.minor KDE release version, taking -# into account KDE's prerelease versioning scheme. -# For example, get_kde_version 17.07.80 will return "17.08". -# If the version equals 9999, "live" is returned. -# If no version is specified, ${PV} is used. -get_kde_version() { - [[ ${EAPI} != 6 ]] && die "${FUNCNAME} is banned in EAPI 7 and later" - local ver=${1:-${PV}} - local major=$(ver_cut 1 ${ver}) - local minor=$(ver_cut 2 ${ver}) - local micro=$(ver_cut 3 ${ver}) - if [[ ${ver} == 9999 ]]; then - echo live - else - (( micro < 50 )) && echo ${major}.${minor} || echo ${major}.$((minor + 1)) - fi -} - -# @FUNCTION: kde_l10n2lingua -# @USAGE: ... -# @INTERNAL -# @DESCRIPTION: -# Output KDE lingua flag name(s) (without prefix(es)) appropriate for -# given l10n(s). -kde_l10n2lingua() { - [[ ${EAPI} != 6 ]] && die "${FUNCNAME} is banned in EAPI 7 and later" - local l - for l; do - case ${l} in - ca-valencia) echo ca@valencia;; - sr-ijekavsk) echo sr@ijekavian;; - sr-Latn-ijekavsk) echo sr@ijekavianlatin;; - sr-Latn) echo sr@latin;; - uz-Cyrl) echo uz@cyrillic;; - *) echo "${l/-/_}";; - esac - done -} - # @FUNCTION: punt_bogus_dep # @USAGE: # @DESCRIPTION: