From: "Mikhail Pukhlikov" <cynede@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/dotnet:master commit in: eclass/
Date: Sun, 31 Jul 2016 08:52:07 +0000 (UTC) [thread overview]
Message-ID: <1469882038.823bf5eab42bcd808742cf6eafed0e6841e4291e.cynede@gentoo> (raw)
commit: 823bf5eab42bcd808742cf6eafed0e6841e4291e
Author: ArsenShnurkov <Arsen.Shnurkov <AT> gmail <DOT> com>
AuthorDate: Sat Jul 30 12:33:58 2016 +0000
Commit: Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
CommitDate: Sat Jul 30 12:33:58 2016 +0000
URL: https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=823bf5ea
patch from https://marc.info/?l=gentoo-dev&m=146852788902799&w=2
eclass/depend.apache.eclass | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/eclass/depend.apache.eclass b/eclass/depend.apache.eclass
index 22a8216..d0b30eb 100644
--- a/eclass/depend.apache.eclass
+++ b/eclass/depend.apache.eclass
@@ -162,6 +162,8 @@ depend.apache_pkg_setup() {
else
_init_no_apache
fi
+ else
+ _init_apache2
fi
}
@@ -226,7 +228,9 @@ need_apache2() {
DEPEND="${DEPEND} ${APACHE2_DEPEND}"
RDEPEND="${RDEPEND} ${APACHE2_DEPEND}"
- _init_apache2
+ case "${EAPI:-0}" in
+ 0|1|2|3|4|5) _init_apache2 ;;
+ esac
}
# @FUNCTION: need_apache2_2
@@ -237,7 +241,9 @@ need_apache2_2() {
DEPEND="${DEPEND} ${APACHE2_2_DEPEND}"
RDEPEND="${RDEPEND} ${APACHE2_2_DEPEND}"
- _init_apache2
+ case "${EAPI:-0}" in
+ 0|1|2|3|4|5) _init_apache2 ;;
+ esac
}
# @FUNCTION: need_apache2_4
@@ -248,7 +254,9 @@ need_apache2_4() {
DEPEND="${DEPEND} ${APACHE2_4_DEPEND}"
RDEPEND="${RDEPEND} ${APACHE2_4_DEPEND}"
- _init_apache2
+ case "${EAPI:-0}" in
+ 0|1|2|3|4|5) _init_apache2 ;;
+ esac
}
# @FUNCTION: has_apache
next reply other threads:[~2016-07-31 8:52 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-31 8:52 Mikhail Pukhlikov [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-10-30 6:44 [gentoo-commits] proj/dotnet:master commit in: eclass/ Mikhail Pukhlikov
2016-11-13 14:14 Mikhail Pukhlikov
2016-10-04 6:14 Mikhail Pukhlikov
2016-08-19 16:12 Mikhail Pukhlikov
2016-08-19 16:12 Mikhail Pukhlikov
2016-08-19 16:12 Mikhail Pukhlikov
2016-08-17 9:44 Mikhail Pukhlikov
2015-10-17 6:40 Heather Cynede
2015-10-17 6:40 Heather Cynede
2015-09-19 10:59 Heather Cynede
2015-09-19 10:59 Heather Cynede
2015-08-22 16:46 Heather Cynede
2015-08-18 8:01 Heather Cynede
2015-08-18 7:56 Heather Cynede
2015-08-17 13:55 Heather Cynede
2015-08-17 13:55 Heather Cynede
2015-08-13 8:14 Heather Cynede
2015-08-05 17:16 Heather Cynede
2015-06-25 7:04 Heather Cynede
2013-09-23 18:38 Heather Cynede
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1469882038.823bf5eab42bcd808742cf6eafed0e6841e4291e.cynede@gentoo \
--to=cynede@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox