gentoo auto-resync : 15:12:2023 - 20:53:45

6 files changed, 47 insertions, 8 deletions

diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 2e55614be1ab..3cbcefdcc514 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/frameworks.kde.org.eclass b/eclass/frameworks.kde.org.eclass
index 5d54b736c91b..248edede2e57 100644
--- a/eclass/frameworks.kde.org.eclass
+++ b/eclass/frameworks.kde.org.eclass
@@ -36,7 +36,7 @@ inherit kde.org
 HOMEPAGE="https://develop.kde.org/products/frameworks/"
 
 SLOT=6
-if [[ ${PV} == 5.9999 ]] || ver_test ${PV} -lt 5.240; then
+if ver_test ${PV} -lt 5.240; then
 	SLOT=5
 fi
 if [[ ${PN} == extra-cmake-modules ]]; then
@@ -63,7 +63,7 @@ _KDE_SRC_URI="mirror://kde/"
 
 case ${KDE_BUILD_TYPE} in
 	live)
-		if [[ ${PV} == 5.9999 ]]; then
+		if [[ ${PV} == 5.239.9999 ]]; then
 			EGIT_BRANCH="kf5"
 		fi
 		;;
@@ -84,7 +84,7 @@ case ${KDE_BUILD_TYPE} in
 					;;
 			esac
 
-			SRC_URI="${_KDE_SRC_URI}${KDE_ORG_NAME}-${PV}.tar.xz"
+			SRC_URI="${_KDE_SRC_URI}${KDE_ORG_TAR_PN}-${PV}.tar.xz"
 		fi
 		;;
 esac
diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass
index 5977c0f72e3c..05889510901f 100644
--- a/eclass/gear.kde.org.eclass
+++ b/eclass/gear.kde.org.eclass
@@ -60,7 +60,7 @@ elif [[ -z ${KDE_ORG_COMMIT} ]]; then
 		*) _KDE_SRC_URI+="stable/release-service/${PV}/src/" ;;
 	esac
 
-	SRC_URI="${_KDE_SRC_URI}${KDE_ORG_NAME}-${PV}.tar.xz"
+	SRC_URI="${_KDE_SRC_URI}${KDE_ORG_TAR_PN}-${PV}.tar.xz"
 fi
 
 fi
diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index c972c12ab8a5..b9d68ccbf5c2 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -98,7 +98,7 @@ readonly KDE_ORG_CATEGORIES
 # @PRE_INHERIT
 # @DESCRIPTION:
 # If unset, default value is set to ${PN}.
-# Name of the package as hosted on kde.org mirrors.
+# Name of the package (repository) as hosted on invent.kde.org.
 : "${KDE_ORG_NAME:=$PN}"
 
 # @ECLASS_VARIABLE: KDE_ORG_SCHEDULE_URI
@@ -114,6 +114,15 @@ readonly KDE_ORG_CATEGORIES
 # add a dependency on sec-policy/selinux-${KDE_SELINUX_MODULE} to (R)DEPEND.
 : "${KDE_SELINUX_MODULE:=none}"
 
+# @ECLASS_VARIABLE: KDE_ORG_TAR_PN
+# @PRE_INHERIT
+# @DESCRIPTION:
+# If unset, default value is set to ${KDE_ORG_NAME}.
+# Filename sans version of the tarball as hosted on kde.org download mirrors.
+# This is used e.g. when upstream's tarball name differs from repository,
+# especially after repository moves.
+: "${KDE_ORG_TAR_PN:=$KDE_ORG_NAME}"
+
 case ${KDE_SELINUX_MODULE} in
 	none)   ;;
 	*)
@@ -179,7 +188,7 @@ case ${KDE_BUILD_TYPE} in
 			S=${WORKDIR}/${KDE_ORG_NAME}-${KDE_ORG_COMMIT}
 			[[ ${CATEGORY} == dev-qt ]] && QT5_BUILD_DIR="${S}_build"
 		else
-			S=${WORKDIR}/${KDE_ORG_NAME}-${PV}
+			S=${WORKDIR}/${KDE_ORG_TAR_PN}-${PV}
 		fi
 		;;
 esac
diff --git a/eclass/llvm.org.eclass b/eclass/llvm.org.eclass
index a92308e38106..95657bab92c2 100644
--- a/eclass/llvm.org.eclass
+++ b/eclass/llvm.org.eclass
@@ -72,6 +72,9 @@ if [[ -z ${_LLVM_SOURCE_TYPE+1} ]]; then
 			_LLVM_SOURCE_TYPE=snapshot
 
 			case ${PV} in
+				18.0.0_pre20231215)
+					EGIT_COMMIT=d37ced88809cb4d2df57ec80887b3f8801ca719b
+					;;
 				18.0.0_pre20231129)
 					EGIT_COMMIT=6a4489a73337907d52e7eaf3716f3de9008e6e53
 					;;
diff --git a/eclass/plasma.kde.org.eclass b/eclass/plasma.kde.org.eclass
index 367ad94a6139..7a829b859676 100644
--- a/eclass/plasma.kde.org.eclass
+++ b/eclass/plasma.kde.org.eclass
@@ -31,6 +31,16 @@ _PLASMA_KDE_ORG_ECLASS=1
 # For proper description see kde.org.eclass manpage.
 KDE_PV_UNRELEASED=( )
 
+# @ECLASS_VARIABLE: _PSLOT
+# @INTERNAL
+# @DESCRIPTION:
+# KDE Plasma major version mapping, implied by package version. This is being
+# used throughout the eclass as a switch between Plasma 5 and 6 packages.
+_PSLOT=6
+if $(ver_test -lt 5.27.50); then
+	_PSLOT=5
+fi
+
 inherit kde.org
 
 HOMEPAGE="https://kde.org/plasma-desktop"
@@ -39,7 +49,7 @@ HOMEPAGE="https://kde.org/plasma-desktop"
 # @INTERNAL
 # @DESCRIPTION:
 # For proper description see kde.org.eclass manpage.
-KDE_ORG_SCHEDULE_URI+="/Plasma_5"
+KDE_ORG_SCHEDULE_URI+="/Plasma_${_PSLOT}"
 
 # @ECLASS_VARIABLE: _KDE_SRC_URI
 # @INTERNAL
@@ -57,10 +67,27 @@ elif [[ -z ${KDE_ORG_COMMIT} ]]; then
 			_KDE_SRC_URI+="unstable/plasma/$(ver_cut 1-3)/"
 			RESTRICT+=" mirror"
 			;;
+		5.9?.0* )
+			_KDE_SRC_URI+="unstable/plasma/$(ver_cut 1-3)/"
+			RESTRICT+=" mirror"
+			;;
 		*) _KDE_SRC_URI+="stable/plasma/$(ver_cut 1-3)/" ;;
 	esac
 
-	SRC_URI="${_KDE_SRC_URI}${KDE_ORG_NAME}-${PV}.tar.xz"
+	SRC_URI="${_KDE_SRC_URI}${KDE_ORG_TAR_PN}-${PV}.tar.xz"
+fi
+
+if [[ ${_PSLOT} == 6 ]]; then
+	case ${PN} in
+		kglobalacceld | \
+		kwayland | \
+		libplasma | \
+		ocean-sound-theme | \
+		plasma-activities | \
+		plasma-activities-stats | \
+		plasma5support) ;;
+		*) RDEPEND+=" !kde-plasma/${PN}:5" ;;
+	esac
 fi
 
 fi