commit: d696d0acb609eb856c3052c8f9f3aea848d2d6d1 Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com> AuthorDate: Sun Dec 31 03:56:40 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Dec 31 17:36:16 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d696d0ac
www-servers/apache: apache-2.eclass: inline USE=split-usr It is undesirable and should be removed, which requires inlining into each ebuild and then removing it in a revbump. Bug: https://bugs.gentoo.org/502384 Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> eclass/apache-2.eclass | 2 +- www-servers/apache/apache-2.4.57-r5.ebuild | 3 +++ www-servers/apache/apache-2.4.57.ebuild | 3 +++ www-servers/apache/apache-2.4.58-r1.ebuild | 3 +++ www-servers/apache/apache-2.4.58.ebuild | 3 +++ 5 files changed, 13 insertions(+), 1 deletion(-) diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass index 4da2e151fed2..86e5dc2a93ba 100644 --- a/eclass/apache-2.eclass +++ b/eclass/apache-2.eclass @@ -88,7 +88,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2 # built-in modules IUSE_MPMS="${IUSE_MPMS_FORK} ${IUSE_MPMS_THREAD}" -IUSE="${IUSE} debug doc gdbm ldap selinux ssl static suexec +suexec-caps suexec-syslog split-usr threads" +IUSE="${IUSE} debug doc gdbm ldap selinux ssl static suexec +suexec-caps suexec-syslog threads" for module in ${IUSE_MODULES} ; do case ${module} in diff --git a/www-servers/apache/apache-2.4.57-r5.ebuild b/www-servers/apache/apache-2.4.57-r5.ebuild index 649085501170..02691c5f39d9 100644 --- a/www-servers/apache/apache-2.4.57-r5.ebuild +++ b/www-servers/apache/apache-2.4.57-r5.ebuild @@ -8,6 +8,9 @@ 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" diff --git a/www-servers/apache/apache-2.4.57.ebuild b/www-servers/apache/apache-2.4.57.ebuild index c5ef6767c8fe..cf939d694848 100644 --- a/www-servers/apache/apache-2.4.57.ebuild +++ b/www-servers/apache/apache-2.4.57.ebuild @@ -8,6 +8,9 @@ GENTOO_PATCHSTAMP="20210212" GENTOO_DEVELOPER="polynomial-c" GENTOO_PATCHNAME="gentoo-apache-2.4.46-r6" +# ancient hack: bug #502384 +IUSE="split-usr" + # IUSE/USE_EXPAND magic IUSE_MPMS_FORK="prefork" IUSE_MPMS_THREAD="event worker" diff --git a/www-servers/apache/apache-2.4.58-r1.ebuild b/www-servers/apache/apache-2.4.58-r1.ebuild index 9ca9e8c742c0..7a858a9b3cbf 100644 --- a/www-servers/apache/apache-2.4.58-r1.ebuild +++ b/www-servers/apache/apache-2.4.58-r1.ebuild @@ -8,6 +8,9 @@ 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" diff --git a/www-servers/apache/apache-2.4.58.ebuild b/www-servers/apache/apache-2.4.58.ebuild index aa9944f2f03f..af8224e7166b 100644 --- a/www-servers/apache/apache-2.4.58.ebuild +++ b/www-servers/apache/apache-2.4.58.ebuild @@ -8,6 +8,9 @@ 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"
