Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-apache/mod_xsendfile/
Date: Fri, 25 Sep 2020 22:57:44
Message-Id: 1601074644.ce8003ed6fe3fcd54842b2a73e5da6225a274691.sam@gentoo
1 commit: ce8003ed6fe3fcd54842b2a73e5da6225a274691
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 25 22:56:49 2020 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 25 22:57:24 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce8003ed
7
8 www-apache/mod_xsendfile: simplify
9
10 Bug: https://bugs.gentoo.org/515414
11 Package-Manager: Portage-3.0.4, Repoman-3.0.1
12 Signed-off-by: Sam James <sam <AT> gentoo.org>
13
14 .../mod_xsendfile/mod_xsendfile-1.0_beta1-r1.ebuild | 17 ++++++++++-------
15 1 file changed, 10 insertions(+), 7 deletions(-)
16
17 diff --git a/www-apache/mod_xsendfile/mod_xsendfile-1.0_beta1-r1.ebuild b/www-apache/mod_xsendfile/mod_xsendfile-1.0_beta1-r1.ebuild
18 index f8147aa6a2b..c111aad8c8e 100644
19 --- a/www-apache/mod_xsendfile/mod_xsendfile-1.0_beta1-r1.ebuild
20 +++ b/www-apache/mod_xsendfile/mod_xsendfile-1.0_beta1-r1.ebuild
21 @@ -15,13 +15,16 @@ LICENSE="Apache-2.0"
22 SLOT="0"
23 KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux"
24
25 -APACHE2_MOD_CONF="50_${PN}"
26 -APACHE2_MOD_DEFINE="XSENDFILE"
27 -DOCFILES="docs/Readme.html"
28 -
29 need_apache2
30
31 -pkg_setup() {
32 - _init_apache2
33 - _init_apache2_late
34 +src_install() {
35 + APACHE2_MOD_CONF="50_${PN}"
36 + APACHE2_MOD_DEFINE="XSENDFILE"
37 + # Triggers unfortunate QA warning in the eclass
38 + # See bug #515414, seems to be an apache-module.eclasss issue
39 + DOCFILES="docs/Readme.html"
40 +
41 + APACHE_MODULESDIR="/usr/$(get_libdir)/apache2/modules"
42 +
43 + apache-module_src_install
44 }