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 (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AFF1815803E for ; Wed, 3 Jan 2024 09:35:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E576B2BC028; Wed, 3 Jan 2024 09:35:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 BEEAC2BC028 for ; Wed, 3 Jan 2024 09:35:02 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DC42D340BEF for ; Wed, 3 Jan 2024 09:35:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 26E871300 for ; Wed, 3 Jan 2024 09:35:00 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1704274444.ae5ffe9ef3c004cb61c9423bfd9199f3c33bd632.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/qt6-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: ae5ffe9ef3c004cb61c9423bfd9199f3c33bd632 X-VCS-Branch: master Date: Wed, 3 Jan 2024 09:35:00 +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: 4f1eb9fa-fa45-4ede-9df7-728aafed4e99 X-Archives-Hash: f3399c2a09006cf2fff2f06f2cd89ffa commit: ae5ffe9ef3c004cb61c9423bfd9199f3c33bd632 Author: Ionen Wolkens gentoo org> AuthorDate: Wed Jan 3 09:27:16 2024 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Wed Jan 3 09:34:04 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae5ffe9e qt6-build.eclass: cleanup deprecated qt6_symlink_binary_to_path No consumers left for a while, kind of forgot about it. If overlays were packaging additional Qt modules, their facing links should be handled automatically even if this function call fails. That is, unless they were doing extra links not suggested by upstream. At that point I'd suggest doing a normal dosym, or better yet report it to Qt so that it will be suggested in user_facing_tool_links.txt for future versions. Signed-off-by: Ionen Wolkens gentoo.org> eclass/qt6-build.eclass | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/eclass/qt6-build.eclass b/eclass/qt6-build.eclass index 0e439e946af3..561a4fe20422 100644 --- a/eclass/qt6-build.eclass +++ b/eclass/qt6-build.eclass @@ -1,4 +1,4 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: qt6-build.eclass @@ -196,20 +196,6 @@ qt_feature() { echo "-DQT_FEATURE_${2:-${1}}=$(usex ${1} ON OFF)" } -# @FUNCTION: qt6_symlink_binary_to_path -# @USAGE: [suffix] -# @DESCRIPTION: -# Symlink a given binary from QT6_BINDIR to QT6_PREFIX/bin, with -# optional suffix. -# -# Note: deprecated, will be removed when no consumers left in-tree, -# see internal the _qt6-build_create_user_facing_links -qt6_symlink_binary_to_path() { - [[ ${#} -ge 1 ]] || die "${FUNCNAME}() requires at least one argument" - - dosym -r "${QT6_BINDIR}"/${1} /usr/bin/${1}${2} -} - ###### Internal functions ###### # @FUNCTION: _qt6-build_create_user_facing_links