From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 65A8115812D for ; Sat, 04 Jan 2025 21:34:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6D083E0819; Sat, 04 Jan 2025 21:34:10 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 55B1BE07D8 for ; Sat, 04 Jan 2025 21:34:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 440CE340BEA for ; Sat, 04 Jan 2025 21:34:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 147071A26 for ; Sat, 04 Jan 2025 21:34:06 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1736026347.c891c27ff33ddcaab27a1337f7065cb5594abed4.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/gstreamer-meson.eclass X-VCS-Directories: eclass/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: c891c27ff33ddcaab27a1337f7065cb5594abed4 X-VCS-Branch: master Date: Sat, 04 Jan 2025 21:34:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b491fe11-23a7-4a77-8370-80dfc64d3488 X-Archives-Hash: caeee14d697523587f440d7dc30547b6 commit: c891c27ff33ddcaab27a1337f7065cb5594abed4 Author: Sam James gentoo org> AuthorDate: Sat Jan 4 19:16:34 2025 +0000 Commit: Sam James gentoo 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 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 }