commit: b0b2554899b7adfcb4ac1340ef88f25afdd10378
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 26 09:53:20 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Jan 26 10:48:30 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0b25548
www-servers/apache: Moved IUSE handling back to eclass
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
eclass/apache-2.eclass | 12 ++++++++++--
www-servers/apache/apache-2.4.46-r1.ebuild | 6 ------
www-servers/apache/apache-2.4.46-r4.ebuild | 6 ------
www-servers/apache/apache-2.4.46.ebuild | 6 ------
4 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass
index 9e80b914afe..e51c12cb0a2 100644
--- a/eclass/apache-2.eclass
+++ b/eclass/apache-2.eclass
@@ -88,10 +88,18 @@ 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 libressl selinux ssl static suexec threads"
+IUSE="${IUSE} debug doc gdbm ldap libressl selinux ssl static suexec
+suexec-caps suexec-syslog split-usr threads"
for module in ${IUSE_MODULES} ; do
- IUSE="${IUSE} apache2_modules_${module}"
+ case ${module} in
+ # Enable http2 by default (bug #563452)
+ http2)
+ IUSE+=" +apache2_modules_${module}"
+ ;;
+ *)
+ IUSE+=" apache2_modules_${module}"
+ ;;
+ esac
done
_apache2_set_mpms() {
diff --git a/www-servers/apache/apache-2.4.46-r1.ebuild
b/www-servers/apache/apache-2.4.46-r1.ebuild
index de842ec792e..16149fb8b80 100644
--- a/www-servers/apache/apache-2.4.46-r1.ebuild
+++ b/www-servers/apache/apache-2.4.46-r1.ebuild
@@ -140,12 +140,6 @@ LICENSE="Apache-2.0 Apache-1.1"
SLOT="2"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc
~x86 ~amd64-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
-# Enable http2 by default (bug #563452)
-# FIXME: Move to apache-2.eclass once this has reached stable.
-IUSE="${IUSE/apache2_modules_http2/+apache2_modules_http2}"
-# New suexec options (since 2.4.34)
-IUSE="${IUSE} +suexec-caps suexec-syslog split-usr"
-
COMMON_DEPEND="apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= )
apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 )
apache2_modules_proxy_http2? ( >=net-libs/nghttp2-1.2.1 )
diff --git a/www-servers/apache/apache-2.4.46-r4.ebuild
b/www-servers/apache/apache-2.4.46-r4.ebuild
index 8a6aea0662a..676c0e2d246 100644
--- a/www-servers/apache/apache-2.4.46-r4.ebuild
+++ b/www-servers/apache/apache-2.4.46-r4.ebuild
@@ -140,12 +140,6 @@ LICENSE="Apache-2.0 Apache-1.1"
SLOT="2"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc
~x86 ~amd64-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
-# Enable http2 by default (bug #563452)
-# FIXME: Move to apache-2.eclass once this has reached stable.
-IUSE="${IUSE/apache2_modules_http2/+apache2_modules_http2}"
-# New suexec options (since 2.4.34)
-IUSE="${IUSE} +suexec-caps suexec-syslog split-usr"
-
COMMON_DEPEND="apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= )
apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 )
apache2_modules_proxy_http2? ( >=net-libs/nghttp2-1.2.1 )
diff --git a/www-servers/apache/apache-2.4.46.ebuild
b/www-servers/apache/apache-2.4.46.ebuild
index b4a4b7d7fb4..828a9a1a834 100644
--- a/www-servers/apache/apache-2.4.46.ebuild
+++ b/www-servers/apache/apache-2.4.46.ebuild
@@ -138,12 +138,6 @@ LICENSE="Apache-2.0 Apache-1.1"
SLOT="2"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
~amd64-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
-# Enable http2 by default (bug #563452)
-# FIXME: Move to apache-2.eclass once this has reached stable.
-IUSE="${IUSE/apache2_modules_http2/+apache2_modules_http2}"
-# New suexec options (since 2.4.34)
-IUSE="${IUSE} +suexec-caps suexec-syslog split-usr"
-
COMMON_DEPEND="apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= )
apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 )
apache2_modules_proxy_http2? ( >=net-libs/nghttp2-1.2.1 )
