commit: 5ecdb90c0fe91d0724bb5947f9f16b81f41f23b6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 26 10:21:04 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 26 10:21:04 2022 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=5ecdb90c
ecm.eclass: Drop EAPI-7 support
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
eclass/ecm.eclass | 32 +++++++++++++-------------------
1 file changed, 13 insertions(+), 19 deletions(-)
diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 1827f07b1d..c388e397da 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -4,7 +4,7 @@
# @ECLASS: ecm.eclass
# @MAINTAINER:
# k...@gentoo.org
-# @SUPPORTED_EAPIS: 7 8
+# @SUPPORTED_EAPIS: 8
# @PROVIDES: cmake virtualx
# @BLURB: Support eclass for packages that use KDE Frameworks with ECM.
# @DESCRIPTION:
@@ -22,7 +22,7 @@
# any phase functions are overridden the version here should also be called.
case ${EAPI} in
- 7|8) ;;
+ 8) ;;
*) die "${ECLASS}: EAPI=${EAPI:-0} is not supported" ;;
esac
@@ -143,9 +143,9 @@ fi
# @DEFAULT_UNSET
# @DESCRIPTION:
# Minimum version of Frameworks to require. Default value for kde-frameworks
-# is ${PV} and 5.64.0 baseline for everything else. This is not going to be
+# is ${PV} and 5.82.0 baseline for everything else. This is not going to be
# changed unless we also bump EAPI, which usually implies (rev-)bumping.
-# Version will later be used to differentiate between KF5/Qt5 and KF6/Qt6.
+# Version will also be used to differentiate between KF5/Qt5 and KF6/Qt6.
if [[ ${CATEGORY} = kde-frameworks ]]; then
: ${KFMIN:=$(ver_cut 1-2)}
fi
@@ -630,16 +630,14 @@ ecm_src_install() {
cmake_src_install
# bug 621970
- if [[ ${EAPI} != 7 ]]; then
- if [[ -d "${ED}"/usr/share/applications ]]; then
- local f
- for f in "${ED}"/usr/share/applications/*.desktop; do
- if [[ -x ${f} ]]; then
- einfo "Removing executable bit from
${f#${ED}}"
- fperms a-x "${f#${ED}}"
- fi
- done
- fi
+ if [[ -d "${ED}"/usr/share/applications ]]; then
+ local f
+ for f in "${ED}"/usr/share/applications/*.desktop; do
+ if [[ -x ${f} ]]; then
+ einfo "Removing executable bit from ${f#${ED}}"
+ fperms a-x "${f#${ED}}"
+ fi
+ done
fi
}
@@ -691,8 +689,4 @@ if [[ -v ${KDE_GCC_MINIMAL} ]]; then
EXPORT_FUNCTIONS pkg_pretend
fi
-EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_test pkg_preinst
pkg_postinst pkg_postrm
-
-if [[ ${EAPI} != 7 ]]; then
- EXPORT_FUNCTIONS src_install
-fi
+EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_test src_install
pkg_preinst pkg_postinst pkg_postrm
