commit:     123a15873fd98645c10f23fdf759226bac842eb8
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Wed Jan  3 05:56:27 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> 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/*

Reply via email to