Gentoo Archives: gentoo-commits

From: Hans de Graaff <graaff@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-apache/passenger/
Date: Mon, 16 Oct 2017 18:57:23
Message-Id: 1508180234.002a07d803aff78b42649214946e5108891594e6.graaff@gentoo
1 commit: 002a07d803aff78b42649214946e5108891594e6
2 Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 16 18:55:59 2017 +0000
4 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 16 18:57:14 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=002a07d8
7
8 www-apache/passenger: Fix building with USE=-apache2, bug 626988
9
10 Package-Manager: Portage-2.3.8, Repoman-2.3.3
11
12 www-apache/passenger/passenger-5.1.11.ebuild | 5 +++++
13 1 file changed, 5 insertions(+)
14
15 diff --git a/www-apache/passenger/passenger-5.1.11.ebuild b/www-apache/passenger/passenger-5.1.11.ebuild
16 index 60b0bdbcc33..9a80d0c6a2a 100644
17 --- a/www-apache/passenger/passenger-5.1.11.ebuild
18 +++ b/www-apache/passenger/passenger-5.1.11.ebuild
19 @@ -73,6 +73,11 @@ all_ruby_prepare() {
20
21 # Fix hard-coded use of AR
22 sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/support/cplusplus.rb || die
23 +
24 + # Make sure apache support is not attempted with -apache2
25 + if ! use apache2 ; then
26 + sed -i -e '/fakeroot/ s/:apache2, //' build/packaging.rb || die
27 + fi
28 }
29
30 all_ruby_compile() {