* [gentoo-dev] [PATCH 1/4] eclass/depend.apache: deprecate apache 2.2 methods
@ 2023-09-29 6:51 Hans de Graaff
2023-09-29 6:51 ` [gentoo-dev] [PATCH 2/4] eclass/depend.apache: enable EAPI 8 Hans de Graaff
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Hans de Graaff @ 2023-09-29 6:51 UTC (permalink / raw)
To: gentoo-dev; +Cc: Hans de Graaff
www-servers/apache-2.2 has been removed in 2019.
---
eclass/depend.apache.eclass | 30 ++++++++++++++++++++++--------
1 file changed, 22 insertions(+), 8 deletions(-)
diff --git a/eclass/depend.apache.eclass b/eclass/depend.apache.eclass
index 4dc3f68daabc..4d1ca573611b 100644
--- a/eclass/depend.apache.eclass
+++ b/eclass/depend.apache.eclass
@@ -109,7 +109,7 @@ APACHE2_DEPEND="=www-servers/apache-2*"
# @ECLASS_VARIABLE: APACHE2_2_DEPEND
# @DESCRIPTION:
-# Dependencies for Apache 2.2.x
+# Dependencies for Apache 2.2.x. Deprecated and removed in EAPI 8.
APACHE2_2_DEPEND="=www-servers/apache-2.2*"
# @ECLASS_VARIABLE: APACHE2_4_DEPEND
@@ -215,10 +215,17 @@ want_apache2() {
want_apache2_2() {
debug-print-function $FUNCNAME $*
- local myiuse=${1:-apache2}
- IUSE="${IUSE} ${myiuse}"
- DEPEND="${DEPEND} ${myiuse}? ( ${APACHE2_2_DEPEND} )"
- RDEPEND="${RDEPEND} ${myiuse}? ( ${APACHE2_2_DEPEND} )"
+ case ${EAPI:-0} in
+ 6|7)
+ local myiuse=${1:-apache2}
+ IUSE="${IUSE} ${myiuse}"
+ DEPEND="${DEPEND} ${myiuse}? ( ${APACHE2_2_DEPEND} )"
+ RDEPEND="${RDEPEND} ${myiuse}? ( ${APACHE2_2_DEPEND} )"
+ ;;
+ *)
+ errror "want-apache2_2 is no longer supported in EAPI 8"
+ ;;
+ esac
}
# @FUNCTION: want_apache2_4
@@ -263,9 +270,16 @@ need_apache2() {
need_apache2_2() {
debug-print-function $FUNCNAME $*
- DEPEND="${DEPEND} ${APACHE2_2_DEPEND}"
- RDEPEND="${RDEPEND} ${APACHE2_2_DEPEND}"
- _init_apache2
+ case ${EAPI:-0} in
+ 6|7)
+ DEPEND="${DEPEND} ${APACHE2_2_DEPEND}"
+ RDEPEND="${RDEPEND} ${APACHE2_2_DEPEND}"
+ _init_apache2
+ ;;
+ *)
+ error "need_apache2-2 is no longer supported in EAPI 8"
+ ;;
+ esac
}
# @FUNCTION: need_apache2_4
--
2.41.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-dev] [PATCH 2/4] eclass/depend.apache: enable EAPI 8
2023-09-29 6:51 [gentoo-dev] [PATCH 1/4] eclass/depend.apache: deprecate apache 2.2 methods Hans de Graaff
@ 2023-09-29 6:51 ` Hans de Graaff
2023-09-29 6:51 ` [gentoo-dev] [PATCH 3/4] eclass/apache-module.eclass: " Hans de Graaff
2023-09-29 6:51 ` [gentoo-dev] [PATCH 4/4] www-apache/mod_xsendfile: update EAPI 7 -> 8 Hans de Graaff
2 siblings, 0 replies; 5+ messages in thread
From: Hans de Graaff @ 2023-09-29 6:51 UTC (permalink / raw)
To: gentoo-dev; +Cc: Hans de Graaff
Bug: https://bugs.gentoo.org/914200
---
eclass/depend.apache.eclass | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/eclass/depend.apache.eclass b/eclass/depend.apache.eclass
index 4d1ca573611b..8f0469931d2c 100644
--- a/eclass/depend.apache.eclass
+++ b/eclass/depend.apache.eclass
@@ -4,7 +4,7 @@
# @ECLASS: depend.apache.eclass
# @MAINTAINER:
# apache-bugs@gentoo.org
-# @SUPPORTED_EAPIS: 6 7
+# @SUPPORTED_EAPIS: 6 7 8
# @BLURB: Functions to allow ebuilds to depend on apache
# @DESCRIPTION:
# This eclass handles depending on apache in a sane way and provides information
@@ -41,7 +41,7 @@
# @CODE
case ${EAPI:-0} in
- 6|7)
+ 6|7|8)
;;
*)
die "EAPI=${EAPI} is not supported by depend.apache.eclass"
--
2.41.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-dev] [PATCH 3/4] eclass/apache-module.eclass: enable EAPI 8
2023-09-29 6:51 [gentoo-dev] [PATCH 1/4] eclass/depend.apache: deprecate apache 2.2 methods Hans de Graaff
2023-09-29 6:51 ` [gentoo-dev] [PATCH 2/4] eclass/depend.apache: enable EAPI 8 Hans de Graaff
@ 2023-09-29 6:51 ` Hans de Graaff
2023-09-29 6:51 ` [gentoo-dev] [PATCH 4/4] www-apache/mod_xsendfile: update EAPI 7 -> 8 Hans de Graaff
2 siblings, 0 replies; 5+ messages in thread
From: Hans de Graaff @ 2023-09-29 6:51 UTC (permalink / raw)
To: gentoo-dev; +Cc: Hans de Graaff
Closes: https://bugs.gentoo.org/914200
---
eclass/apache-module.eclass | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/eclass/apache-module.eclass b/eclass/apache-module.eclass
index 8074aff5ddcb..5a84ffedf71a 100644
--- a/eclass/apache-module.eclass
+++ b/eclass/apache-module.eclass
@@ -4,7 +4,7 @@
# @ECLASS: apache-module.eclass
# @MAINTAINER:
# apache-bugs@gentoo.org
-# @SUPPORTED_EAPIS: 6 7
+# @SUPPORTED_EAPIS: 6 7 8
# @BLURB: Provides a common set of functions for apache modules
# @DESCRIPTION:
# This eclass handles apache modules in a sane way.
@@ -45,7 +45,7 @@
# @CODE
case ${EAPI} in
- 6|7) ;;
+ 6|7|8) ;;
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
esac
--
2.41.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-dev] [PATCH 4/4] www-apache/mod_xsendfile: update EAPI 7 -> 8
2023-09-29 6:51 [gentoo-dev] [PATCH 1/4] eclass/depend.apache: deprecate apache 2.2 methods Hans de Graaff
2023-09-29 6:51 ` [gentoo-dev] [PATCH 2/4] eclass/depend.apache: enable EAPI 8 Hans de Graaff
2023-09-29 6:51 ` [gentoo-dev] [PATCH 3/4] eclass/apache-module.eclass: " Hans de Graaff
@ 2023-09-29 6:51 ` Hans de Graaff
2 siblings, 0 replies; 5+ messages in thread
From: Hans de Graaff @ 2023-09-29 6:51 UTC (permalink / raw)
To: gentoo-dev; +Cc: Hans de Graaff
Signed-off-by: Hans de Graaff <graaff@gentoo.org>
---
.../mod_xsendfile-1.0_beta1-r3.ebuild | 28 +++++++++++++++++++
1 file changed, 28 insertions(+)
create mode 100644 www-apache/mod_xsendfile/mod_xsendfile-1.0_beta1-r3.ebuild
diff --git a/www-apache/mod_xsendfile/mod_xsendfile-1.0_beta1-r3.ebuild b/www-apache/mod_xsendfile/mod_xsendfile-1.0_beta1-r3.ebuild
new file mode 100644
index 000000000000..b70dfc8ac59d
--- /dev/null
+++ b/www-apache/mod_xsendfile/mod_xsendfile-1.0_beta1-r3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit apache-module
+
+MY_PV="1.0b1"
+DESCRIPTION="Apache module that processes X-SENDFILE headers registered by the output handler"
+HOMEPAGE="https://tn123.org/mod_xsendfile/"
+SRC_URI="https://tn123.org/mod_xsendfile/beta/${PN}-${MY_PV}.tar.gz"
+S="${WORKDIR}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux"
+
+need_apache2
+
+src_install() {
+ APACHE2_MOD_CONF="50_${PN}"
+ APACHE2_MOD_DEFINE="XSENDFILE"
+ APACHE_MODULESDIR="/usr/$(get_libdir)/apache2/modules"
+
+ apache-module_src_install
+
+ dodoc docs/Readme.html
+}
--
2.41.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-dev] [PATCH 1/4] eclass/depend.apache: deprecate apache 2.2 methods
@ 2023-09-29 6:40 Hans de Graaff
0 siblings, 0 replies; 5+ messages in thread
From: Hans de Graaff @ 2023-09-29 6:40 UTC (permalink / raw)
To: gentoo-dev; +Cc: Hans de Graaff
www-servers/apache-2.2 has been removed in 2019.
---
eclass/depend.apache.eclass | 30 ++++++++++++++++++++++--------
1 file changed, 22 insertions(+), 8 deletions(-)
diff --git a/eclass/depend.apache.eclass b/eclass/depend.apache.eclass
index 4dc3f68daabc..4d1ca573611b 100644
--- a/eclass/depend.apache.eclass
+++ b/eclass/depend.apache.eclass
@@ -109,7 +109,7 @@ APACHE2_DEPEND="=www-servers/apache-2*"
# @ECLASS_VARIABLE: APACHE2_2_DEPEND
# @DESCRIPTION:
-# Dependencies for Apache 2.2.x
+# Dependencies for Apache 2.2.x. Deprecated and removed in EAPI 8.
APACHE2_2_DEPEND="=www-servers/apache-2.2*"
# @ECLASS_VARIABLE: APACHE2_4_DEPEND
@@ -215,10 +215,17 @@ want_apache2() {
want_apache2_2() {
debug-print-function $FUNCNAME $*
- local myiuse=${1:-apache2}
- IUSE="${IUSE} ${myiuse}"
- DEPEND="${DEPEND} ${myiuse}? ( ${APACHE2_2_DEPEND} )"
- RDEPEND="${RDEPEND} ${myiuse}? ( ${APACHE2_2_DEPEND} )"
+ case ${EAPI:-0} in
+ 6|7)
+ local myiuse=${1:-apache2}
+ IUSE="${IUSE} ${myiuse}"
+ DEPEND="${DEPEND} ${myiuse}? ( ${APACHE2_2_DEPEND} )"
+ RDEPEND="${RDEPEND} ${myiuse}? ( ${APACHE2_2_DEPEND} )"
+ ;;
+ *)
+ errror "want-apache2_2 is no longer supported in EAPI 8"
+ ;;
+ esac
}
# @FUNCTION: want_apache2_4
@@ -263,9 +270,16 @@ need_apache2() {
need_apache2_2() {
debug-print-function $FUNCNAME $*
- DEPEND="${DEPEND} ${APACHE2_2_DEPEND}"
- RDEPEND="${RDEPEND} ${APACHE2_2_DEPEND}"
- _init_apache2
+ case ${EAPI:-0} in
+ 6|7)
+ DEPEND="${DEPEND} ${APACHE2_2_DEPEND}"
+ RDEPEND="${RDEPEND} ${APACHE2_2_DEPEND}"
+ _init_apache2
+ ;;
+ *)
+ error "need_apache2-2 is no longer supported in EAPI 8"
+ ;;
+ esac
}
# @FUNCTION: need_apache2_4
--
2.41.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-09-29 6:52 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-09-29 6:51 [gentoo-dev] [PATCH 1/4] eclass/depend.apache: deprecate apache 2.2 methods Hans de Graaff
2023-09-29 6:51 ` [gentoo-dev] [PATCH 2/4] eclass/depend.apache: enable EAPI 8 Hans de Graaff
2023-09-29 6:51 ` [gentoo-dev] [PATCH 3/4] eclass/apache-module.eclass: " Hans de Graaff
2023-09-29 6:51 ` [gentoo-dev] [PATCH 4/4] www-apache/mod_xsendfile: update EAPI 7 -> 8 Hans de Graaff
-- strict thread matches above, loose matches on Subject: below --
2023-09-29 6:40 [gentoo-dev] [PATCH 1/4] eclass/depend.apache: deprecate apache 2.2 methods Hans de Graaff
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox