Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-apache/mpm_itk/
Date: Tue, 28 Jun 2022 14:32:53
Message-Id: 1656426755.1b40dc15f782daaa5af23887d71bf0fcab00f5dd.soap@gentoo
1 commit: 1b40dc15f782daaa5af23887d71bf0fcab00f5dd
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jun 28 14:32:35 2022 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Tue Jun 28 14:32:35 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b40dc15
7
8 www-apache/mpm_itk: update EAPI 5 -> 7
9
10 Closes: https://bugs.gentoo.org/828744
11 Signed-off-by: David Seifert <soap <AT> gentoo.org>
12
13 ...m_itk-2.4.7_p4-r1.ebuild => mpm_itk-2.4.7_p4-r2.ebuild} | 14 +++++++++-----
14 1 file changed, 9 insertions(+), 5 deletions(-)
15
16 diff --git a/www-apache/mpm_itk/mpm_itk-2.4.7_p4-r1.ebuild b/www-apache/mpm_itk/mpm_itk-2.4.7_p4-r2.ebuild
17 similarity index 91%
18 rename from www-apache/mpm_itk/mpm_itk-2.4.7_p4-r1.ebuild
19 rename to www-apache/mpm_itk/mpm_itk-2.4.7_p4-r2.ebuild
20 index 7c684962d236..093dfa16ab39 100644
21 --- a/www-apache/mpm_itk/mpm_itk-2.4.7_p4-r1.ebuild
22 +++ b/www-apache/mpm_itk/mpm_itk-2.4.7_p4-r2.ebuild
23 @@ -1,7 +1,8 @@
24 -# Copyright 1999-2016 Gentoo Foundation
25 +# Copyright 1999-2022 Gentoo Authors
26 # Distributed under the terms of the GNU General Public License v2
27
28 -EAPI=5
29 +EAPI=7
30 +
31 inherit apache-module linux-info
32
33 MY_PN=${PN/_/-}
34 @@ -11,13 +12,11 @@ MY_P=${MY_PN}-${MY_PV}
35 DESCRIPTION="Run virtual hosts under separate users/groups"
36 HOMEPAGE="http://mpm-itk.sesse.net/"
37 SRC_URI="http://mpm-itk.sesse.net/${MY_P}.tar.gz"
38 +S="${WORKDIR}/${MY_P}"
39
40 LICENSE="Apache-2.0"
41 SLOT="0"
42 KEYWORDS="amd64 x86"
43 -IUSE=""
44 -
45 -S="${WORKDIR}/${MY_P}"
46
47 # The libcap dependency is automagic, so we require it
48 # unconditionally. Reported upstream at,
49 @@ -35,6 +34,7 @@ RDEPEND="${DEPEND}"
50 APACHE2_MOD_CONF="00_${PN}"
51 APACHE2_MOD_DEFINE="MPM_ITK"
52 APXS2_ARGS="-c ${PN}.c seccomp.c -lcap"
53 +
54 need_apache2_4
55
56 pkg_setup() {
57 @@ -47,4 +47,8 @@ pkg_setup() {
58 ewarn "for LimitUIDRange and LimitGIDRange which we include by"
59 ewarn "default in ${APACHE2_MOD_CONF}.conf."
60 fi
61 +
62 + # Work around bug #616612
63 + _init_apache2
64 + _init_apache2_late
65 }