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 2B5C415803E for ; Wed, 3 Jan 2024 06:20:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 473CB2BC028; Wed, 3 Jan 2024 06:20:35 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 278152BC028 for ; Wed, 3 Jan 2024 06:20:35 +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 4FE1A33D3C2 for ; Wed, 3 Jan 2024 06:20:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 89B2D99E for ; Wed, 3 Jan 2024 06:20:32 +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: <1704262823.123a15873fd98645c10f23fdf759226bac842eb8.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/apache-2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 123a15873fd98645c10f23fdf759226bac842eb8 X-VCS-Branch: master Date: Wed, 3 Jan 2024 06:20:32 +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: 11ea062b-22a9-4b1e-b47f-81110d630efe X-Archives-Hash: 9bb8a10a83ed3894beb25afa9f8979c3 commit: 123a15873fd98645c10f23fdf759226bac842eb8 Author: Eli Schwartz gmail com> AuthorDate: Wed Jan 3 05:56:27 2024 +0000 Commit: Sam James gentoo org> CommitDate: Wed Jan 3 06:20:23 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=123a1587 apache-2.eclass: drop outdated symlink In commit 90f738b661e9e6cf903cd2a65418a6e00482c19f, the destination got deleted. apxs is no longer in the sbin directory. On split-usr systems, sbin isn't a symlink to bin, so the symlink is also *broken*. There are two general solutions here: - Fix the symlink to symlink to /usr/bin instead. - This symlink was created in 2007 as a temporary porting measure, and it is long past time it got removed. So just remove it. We go with option 2. One more legacy hack gone. Bug: https://bugs.gentoo.org/177697 Fixes: 90f738b661e9e6cf903cd2a65418a6e00482c19f Closes: https://bugs.gentoo.org/921191 Signed-off-by: Eli Schwartz gmail.com> Signed-off-by: Sam James gentoo.org> eclass/apache-2.eclass | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass index 86e5dc2a93ba..e1489eb282ac 100644 --- a/eclass/apache-2.eclass +++ b/eclass/apache-2.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: apache-2.eclass @@ -634,9 +634,6 @@ apache-2_src_install() { dosym /etc/init.d/apache2 /usr/sbin/apache2ctl fi - # provide legacy symlink for apxs, bug 177697 - dosym apxs /usr/sbin/apxs2 - # install some documentation dodoc ABOUT_APACHE CHANGES LAYOUT README README.platforms VERSIONING dodoc "${GENTOO_PATCHDIR}"/docs/*