diff options
| author |   Eli Schwartz <eschwartz93@gmail.com> | 2023-12-30 22:40:52 -0500 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2023-12-31 17:36:16 +0000 |
| commit | 90f738b661e9e6cf903cd2a65418a6e00482c19f (patch) | |
| tree | 5670ae56c74d336ad947c68aa515e685cb1dadb1 /www-servers/apache | |
| parent | www-servers/apache: apache-2.eclass: inline USE=split-usr (diff) | |
| download | gentoo-90f738b661e9e6cf903cd2a65418a6e00482c19f.tar.gz gentoo-90f738b661e9e6cf903cd2a65418a6e00482c19f.tar.bz2 gentoo-90f738b661e9e6cf903cd2a65418a6e00482c19f.zip | |
www-servers/apache: clean up ancient outdated split-usr hack
For nearly a decade, USE=split-usr has been declared in apache-2.eclass
and provides a hack intended as a short-term migration for moving a
binary from /usr/sbin to /usr/bin.
No remaining cases of /usr/sbin/apxs exist in tree, so drop the symlink
and the USE flag and revbump.
Closes: https://bugs.gentoo.org/502384
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'www-servers/apache')
| -rw-r--r-- | www-servers/apache/apache-2.4.57-r6.ebuild (renamed from www-servers/apache/apache-2.4.57-r5.ebuild) | 7 | ||||
| -rw-r--r-- | www-servers/apache/apache-2.4.58-r2.ebuild (renamed from www-servers/apache/apache-2.4.58-r1.ebuild) | 7 |
2 files changed, 0 insertions, 14 deletions
diff --git a/www-servers/apache/apache-2.4.57-r5.ebuild b/www-servers/apache/apache-2.4.57-r6.ebuild index 02691c5f39d9..bf8fd0ba00f5 100644 --- a/www-servers/apache/apache-2.4.57-r5.ebuild +++ b/www-servers/apache/apache-2.4.57-r6.ebuild @@ -8,9 +8,6 @@ GENTOO_PATCHSTAMP="20231011" GENTOO_DEVELOPER="graaff" GENTOO_PATCHNAME="gentoo-apache-2.4.57-r5" -# ancient hack: bug #502384 -IUSE="split-usr" - # IUSE/USE_EXPAND magic IUSE_MPMS_FORK="prefork" IUSE_MPMS_THREAD="event worker" @@ -193,11 +190,7 @@ src_install() { rm "${ED}"/${i} || die "Failed to prune apache-tools bits" done - # install apxs in /usr/bin (bug #502384) and put a symlink into the - # old location until all ebuilds and eclasses have been modified to - # use the new location. dobin support/apxs - use split-usr && dosym ../bin/apxs /usr/sbin/apxs # Note: wait for mod_systemd to be included in some forthcoming release, # Then apache2.4.service can be used and systemd support controlled diff --git a/www-servers/apache/apache-2.4.58-r1.ebuild b/www-servers/apache/apache-2.4.58-r2.ebuild index 7a858a9b3cbf..5b5e4fb1a034 100644 --- a/www-servers/apache/apache-2.4.58-r1.ebuild +++ b/www-servers/apache/apache-2.4.58-r2.ebuild @@ -8,9 +8,6 @@ GENTOO_PATCHSTAMP="20231019" GENTOO_DEVELOPER="graaff" GENTOO_PATCHNAME="gentoo-apache-2.4.58" -# ancient hack: bug #502384 -IUSE="split-usr" - # IUSE/USE_EXPAND magic IUSE_MPMS_FORK="prefork" IUSE_MPMS_THREAD="event worker" @@ -193,11 +190,7 @@ src_install() { rm "${ED}"/${i} || die "Failed to prune apache-tools bits" done - # install apxs in /usr/bin (bug #502384) and put a symlink into the - # old location until all ebuilds and eclasses have been modified to - # use the new location. dobin support/apxs - use split-usr && dosym ../bin/apxs /usr/sbin/apxs # Note: wait for mod_systemd to be included in some forthcoming release, # Then apache2.4.service can be used and systemd support controlled |