[PATCH 3/4] kde.org.eclass: Handle src_unpack for live ebuild Corrosion here

Andreas Sturmlechner <[email protected]> Sat, 06 Jun 2026 01:09:35 +0200

Newsgroups	gmane.linux.gentoo.devel
Message-ID	<[email protected]>

Signed-off-by: Andreas Sturmlechner <[email protected]>
---
 eclass/kde.org.eclass | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index 93909d58e71e..d35ec6502e69 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -243,12 +243,27 @@ _kde.org_live_corrosion_unpack() {
 # @FUNCTION: kde.org_src_unpack
 # @DESCRIPTION:
 # Unpack the sources, automatically handling both release and live ebuilds.
+# For releases, if cargo.eclass is inherited, call cargo_src_unpack instead of
+# default.  For live ebuilds, if both cmake.eclass and cargo.eclass are
+# inherited, deal with potential Corrosion.
 kde.org_src_unpack() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	case ${KDE_BUILD_TYPE} in
-		live) git-r3_src_unpack ;&
-		*) default ;;
+		live)
+			git-r3_src_unpack
+			default
+			if has cmake ${INHERITED} && has cargo ${INHERITED}; then
+				_kde.org_live_corrosion_unpack
+			fi
+			;;
+		*)
+			if has cargo ${INHERITED}; then
+				cargo_src_unpack
+			else
+				default
+			fi
+			;;
 	esac
 }
 
-- 
2.54.0

signature.asc (application/pgp-signature, 829 B)