From e4d9d6796d5018e338f0b27a3bc97716195bf0b8 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sun, 5 Jan 2025 06:31:58 +0000
Subject: gentoo auto-resync : 05:01:2025 - 06:31:57

---
 eclass/Manifest.gz            | Bin 40170 -> 40177 bytes
 eclass/gstreamer-meson.eclass |  20 +++++++++-----------
 eclass/llvm.org.eclass        |  17 ++++-------------
 3 files changed, 13 insertions(+), 24 deletions(-)

(limited to 'eclass')

diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 92b4af37db9c..dfe37f2761e5 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/gstreamer-meson.eclass b/eclass/gstreamer-meson.eclass
index 937c86a0f15b..15b0a6390a42 100644
--- a/eclass/gstreamer-meson.eclass
+++ b/eclass/gstreamer-meson.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: gstreamer-meson.eclass
@@ -38,11 +38,6 @@ esac
 PYTHON_COMPAT=( python3_{10..12} )
 [[ ${EAPI} == 8 ]] && inherit python-any-r1
 
-# TODO: Remove after all older versions are gone from tree
-if ver_test ${PV} -lt 1.22.10 ; then
-	inherit virtualx
-fi
-
 # multilib-minimal goes last
 inherit meson multilib toolchain-funcs xdg-utils multilib-minimal
 
@@ -133,10 +128,7 @@ gstreamer_system_package() {
 			pc=${tuple#*:}-${SLOT}
 			sed -e "1i${dependency} = dependency('${pc}', required : true)" \
 				-i "${pdir}"/meson.build || die
-			# TODO: Remove conditional applying once older versions are all gone
-			if ver_test ${PV} -gt 1.22.5 ; then
-				sed -e "/meson\.override_dependency[(]pkg_name, ${dependency}[)]/d" -i "${S}"/gst-libs/gst/*/meson.build || die
-			fi
+			sed -e "/meson\.override_dependency[(]pkg_name, ${dependency}[)]/d" -i "${S}"/gst-libs/gst/*/meson.build || die
 		done
 	done
 }
@@ -207,8 +199,14 @@ S="${WORKDIR}/${GST_ORG_MODULE}-${PV}"
 LICENSE="GPL-2"
 SLOT="1.0"
 
+if ver_test ${GST_ORG_PVP} -ge 1.24 ; then
+	GLIB_VERSION=2.64.0
+else
+	GLIB_VERSION=2.62.0
+fi
+
 RDEPEND="
-	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-${GLIB_VERSION}:2[${MULTILIB_USEDEP}]
 "
 BDEPEND="
 	virtual/pkgconfig
diff --git a/eclass/llvm.org.eclass b/eclass/llvm.org.eclass
index 9b5be08eb1bb..0d5a8f6b5c83 100644
--- a/eclass/llvm.org.eclass
+++ b/eclass/llvm.org.eclass
@@ -1,4 +1,4 @@
-# Copyright 2019-2024 Gentoo Authors
+# Copyright 2019-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: llvm.org.eclass
@@ -72,21 +72,12 @@ if [[ -z ${_LLVM_SOURCE_TYPE+1} ]]; then
 			_LLVM_SOURCE_TYPE=snapshot
 
 			case ${PV} in
+				20.0.0_pre20250104)
+					EGIT_COMMIT=2529a8df53af9bc6cecfd6c83404ffa5e89e3370
+					;;
 				20.0.0_pre20241227)
 					EGIT_COMMIT=ccfe0de0e1e37ed369c9bf89dd0188ba0afb2e9a
 					;;
-				20.0.0_pre20241221)
-					EGIT_COMMIT=665d79f2e967a5eee6fff93685e45f50cf24cab2
-					;;
-				20.0.0_pre20241215)
-					EGIT_COMMIT=49a5ad8e5714fd404210279303acc97b495d66d0
-					;;
-				20.0.0_pre20241207)
-					EGIT_COMMIT=32f7f0010bca99ee4bd917f57272733fb2bf3bd9
-					;;
-				20.0.0_pre20241130)
-					EGIT_COMMIT=a348f223cab54b21a7b1c38dec7bc6aa2f81c949
-					;;
 				*)
 					die "Unknown snapshot: ${PV}"
 					;;
-- 
cgit v1.2.3