commit: c891c27ff33ddcaab27a1337f7065cb5594abed4
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 4 19:16:34 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 4 21:32:27 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c891c27f
gstreamer-meson.eclass: cleanup TODOs for old/new versions
Signed-off-by: Sam James <sam <AT> gentoo.org>
eclass/gstreamer-meson.eclass | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/eclass/gstreamer-meson.eclass b/eclass/gstreamer-meson.eclass
index 937c86a0f15b..7d6b5d6b3249 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
}