From adb727afeb568404873e8cbc91ba93d3d49eff13 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Mon, 26 Dec 2022 14:07:48 +0000
Subject: gentoo auto-resync : 26:12:2022 - 14:07:48

---
 eclass/Manifest.gz    | Bin 37364 -> 37347 bytes
 eclass/ecm.eclass     |  32 +++++++++++++-------------------
 eclass/kde.org.eclass |   4 ++--
 3 files changed, 15 insertions(+), 21 deletions(-)

(limited to 'eclass')

diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 560d5f97aa92..d0b080ed4d66 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index f0fb68cb7dfd..ef9911250fa4 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -4,7 +4,7 @@
 # @ECLASS: ecm.eclass
 # @MAINTAINER:
 # kde@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
@@ -615,16 +615,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
 }
 
@@ -676,8 +674,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
diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index a39e205d0e93..efe3186f286c 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -4,7 +4,7 @@
 # @ECLASS: kde.org.eclass
 # @MAINTAINER:
 # kde@gentoo.org
-# @SUPPORTED_EAPIS: 7 8
+# @SUPPORTED_EAPIS: 8
 # @BLURB: Support eclass for packages that are hosted on kde.org infrastructure.
 # @DESCRIPTION:
 # This eclass is mainly providing facilities for the three upstream release
@@ -16,7 +16,7 @@
 # particular build system.
 
 case ${EAPI} in
-	7|8) ;;
+	8) ;;
 	*) die "EAPI=${EAPI:-0} is not supported" ;;
 esac
 
-- 
cgit v1.2.3