* [gentoo-commits] repo/gentoo:master commit in: www-servers/apache/, eclass/
@ 2021-01-26 10:48 Lars Wendler
0 siblings, 0 replies; 3+ messages in thread
From: Lars Wendler @ 2021-01-26 10:48 UTC (permalink / raw
To: gentoo-commits
commit: d66c5adc14c6fee52850fdec390067647523c923
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 26 10:11:16 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=d66c5adc
www-servers/apache: Moved dependencies into 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 | 37 ++++++++++++++++++++++++++----
www-servers/apache/apache-2.4.46-r1.ebuild | 16 -------------
www-servers/apache/apache-2.4.46-r4.ebuild | 16 -------------
www-servers/apache/apache-2.4.46.ebuild | 16 -------------
4 files changed, 33 insertions(+), 52 deletions(-)
diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass
index e51c12cb0a2..fecf92eb0f7 100644
--- a/eclass/apache-2.eclass
+++ b/eclass/apache-2.eclass
@@ -129,23 +129,52 @@ _apache2_set_mpms() {
_apache2_set_mpms
unset -f _apache2_set_mpms
-DEPEND="${COMMON_DEPEND}
+# Dependencies
+RDEPEND="
dev-lang/perl
=dev-libs/apr-util-1*:=[gdbm=,ldap?]
dev-libs/libpcre
+ apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= )
apache2_modules_deflate? ( sys-libs/zlib )
+ apache2_modules_http2? (
+ >=net-libs/nghttp2-1.2.1
+ kernel_linux? ( sys-apps/util-linux )
+ )
+ apache2_modules_md? ( >=dev-libs/jansson-2.10 )
apache2_modules_mime? ( app-misc/mime-types )
+ apache2_modules_proxy_http2? (
+ >=net-libs/nghttp2-1.2.1
+ kernel_linux? ( sys-apps/util-linux )
+ )
+ apache2_modules_session_crypto? (
+ libressl? ( dev-libs/apr-util[libressl] )
+ !libressl? ( dev-libs/apr-util[openssl] )
+ )
gdbm? ( sys-libs/gdbm:= )
ldap? ( =net-nds/openldap-2* )
+ selinux? ( sec-policy/selinux-apache )
ssl? (
!libressl? ( >=dev-libs/openssl-1.0.2:0= )
libressl? ( dev-libs/libressl:0= )
+ kernel_linux? ( sys-apps/util-linux )
)
- !=www-servers/apache-1*"
-RDEPEND+=" ${DEPEND}
- selinux? ( sec-policy/selinux-apache )"
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ suexec? ( suexec-caps? ( sys-libs/libcap ) )
+"
+if [[ ${EAPI} == 6 ]] ; then
+ DEPEND+=" ${BDEPEND}"
+fi
PDEPEND="~app-admin/apache-tools-${PV}"
+REQUIRED_USE+="
+ apache2_modules_http2? ( ssl )
+ apache2_modules_md? ( ssl )
+"
+
S="${WORKDIR}/httpd-${PV}"
# @VARIABLE: MODULE_DEPENDS
diff --git a/www-servers/apache/apache-2.4.46-r1.ebuild b/www-servers/apache/apache-2.4.46-r1.ebuild
index 16149fb8b80..a9d64875c3c 100644
--- a/www-servers/apache/apache-2.4.46-r1.ebuild
+++ b/www-servers/apache/apache-2.4.46-r1.ebuild
@@ -140,22 +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"
-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 )
- apache2_modules_md? ( >=dev-libs/jansson-2.10 )
- apache2_modules_session_crypto? (
- libressl? ( dev-libs/apr-util[libressl] )
- !libressl? ( dev-libs/apr-util[openssl] )
- )"
-
-DEPEND+="${COMMON_DEPEND}
- suexec? ( suexec-caps? ( sys-libs/libcap ) )"
-RDEPEND+="${COMMON_DEPEND}"
-
-REQUIRED_USE="apache2_modules_http2? ( ssl )
- apache2_modules_md? ( ssl )"
-
PATCHES=(
"${FILESDIR}/${PN}-2.4.41-libressl.patch" #668060
)
diff --git a/www-servers/apache/apache-2.4.46-r4.ebuild b/www-servers/apache/apache-2.4.46-r4.ebuild
index 676c0e2d246..f3446c2754f 100644
--- a/www-servers/apache/apache-2.4.46-r4.ebuild
+++ b/www-servers/apache/apache-2.4.46-r4.ebuild
@@ -140,22 +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"
-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 )
- apache2_modules_md? ( >=dev-libs/jansson-2.10 )
- apache2_modules_session_crypto? (
- libressl? ( dev-libs/apr-util[libressl] )
- !libressl? ( dev-libs/apr-util[openssl] )
- )"
-
-DEPEND+="${COMMON_DEPEND}
- suexec? ( suexec-caps? ( sys-libs/libcap ) )"
-RDEPEND+="${COMMON_DEPEND}"
-
-REQUIRED_USE="apache2_modules_http2? ( ssl )
- apache2_modules_md? ( ssl )"
-
PATCHES=(
"${FILESDIR}/${PN}-2.4.41-libressl.patch" #668060
)
diff --git a/www-servers/apache/apache-2.4.46.ebuild b/www-servers/apache/apache-2.4.46.ebuild
index 828a9a1a834..1f2646bf81e 100644
--- a/www-servers/apache/apache-2.4.46.ebuild
+++ b/www-servers/apache/apache-2.4.46.ebuild
@@ -138,22 +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"
-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 )
- apache2_modules_md? ( >=dev-libs/jansson-2.10 )
- apache2_modules_session_crypto? (
- libressl? ( dev-libs/apr-util[libressl] )
- !libressl? ( dev-libs/apr-util[openssl] )
- )"
-
-DEPEND+="${COMMON_DEPEND}
- suexec? ( suexec-caps? ( sys-libs/libcap ) )"
-RDEPEND+="${COMMON_DEPEND}"
-
-REQUIRED_USE="apache2_modules_http2? ( ssl )
- apache2_modules_md? ( ssl )"
-
PATCHES=(
"${FILESDIR}/${PN}-2.4.41-libressl.patch" #668060
)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/apache/, eclass/
@ 2021-01-26 10:48 Lars Wendler
0 siblings, 0 replies; 3+ messages in thread
From: Lars Wendler @ 2021-01-26 10:48 UTC (permalink / raw
To: gentoo-commits
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 )
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-servers/apache/, eclass/
@ 2022-03-04 10:13 Lars Wendler
0 siblings, 0 replies; 3+ messages in thread
From: Lars Wendler @ 2022-03-04 10:13 UTC (permalink / raw
To: gentoo-commits
commit: 9bcf4b43231553045cc01af491969aa794091761
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 4 10:04:44 2022 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Mar 4 10:12:55 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bcf4b43
www-servers/apache: Move remaining lua stuff into eclass
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
eclass/apache-2.eclass | 2 ++
www-servers/apache/apache-2.4.51-r2.ebuild | 4 ----
www-servers/apache/apache-2.4.52-r1.ebuild | 4 ----
3 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass
index e6ca32db3ea5..f9223646c8bb 100644
--- a/eclass/apache-2.eclass
+++ b/eclass/apache-2.eclass
@@ -150,6 +150,7 @@ RDEPEND="
>=net-libs/nghttp2-1.2.1
kernel_linux? ( sys-apps/util-linux )
)
+ apache2_modules_lua? ( ${LUA_DEPS} )
apache2_modules_md? ( >=dev-libs/jansson-2.10 )
apache2_modules_mime? ( app-misc/mime-types )
apache2_modules_proxy_http2? (
@@ -181,6 +182,7 @@ PDEPEND="~app-admin/apache-tools-${PV}"
REQUIRED_USE+="
apache2_modules_http2? ( ssl )
+ apache2_modules_lua? ( ${LUA_REQUIRED_USE} )
apache2_modules_md? ( ssl )
"
diff --git a/www-servers/apache/apache-2.4.51-r2.ebuild b/www-servers/apache/apache-2.4.51-r2.ebuild
index 7660f0cbf358..665efaba2fe0 100644
--- a/www-servers/apache/apache-2.4.51-r2.ebuild
+++ b/www-servers/apache/apache-2.4.51-r2.ebuild
@@ -142,10 +142,6 @@ LICENSE="Apache-2.0 Apache-1.1"
SLOT="2"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
-# FIXME! Move this to eclass once all ebuilds are EAPI-7
-RDEPEND+=" apache2_modules_lua? ( ${LUA_DEPS} )"
-REQUIRED_USE+=" apache2_modules_lua? ( ${LUA_REQUIRED_USE} )"
-
PATCHES=( "${FILESDIR}/apache-2.4.51-mpm-itk.patch" )
pkg_setup() {
diff --git a/www-servers/apache/apache-2.4.52-r1.ebuild b/www-servers/apache/apache-2.4.52-r1.ebuild
index bb742bd17560..34f5fc10b748 100644
--- a/www-servers/apache/apache-2.4.52-r1.ebuild
+++ b/www-servers/apache/apache-2.4.52-r1.ebuild
@@ -142,10 +142,6 @@ LICENSE="Apache-2.0 Apache-1.1"
SLOT="2"
KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
-# FIXME! Move this to eclass once all ebuilds are EAPI-7
-RDEPEND+=" apache2_modules_lua? ( ${LUA_DEPS} )"
-REQUIRED_USE+=" apache2_modules_lua? ( ${LUA_REQUIRED_USE} )"
-
pkg_setup() {
# dependend critical modules which are not allowed in global scope due
# to USE flag conditionals (bug #499260)
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-03-04 10:13 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-26 10:48 [gentoo-commits] repo/gentoo:master commit in: www-servers/apache/, eclass/ Lars Wendler
-- strict thread matches above, loose matches on Subject: below --
2022-03-04 10:13 Lars Wendler
2021-01-26 10:48 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox