From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-949388-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id EF4B8139694
for <garchives@archives.gentoo.org>; Fri, 12 May 2017 08:29:30 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 88B93E0C3D;
Fri, 12 May 2017 08:29:27 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 56807E0C3D
for <gentoo-commits@lists.gentoo.org>; Fri, 12 May 2017 08:29:27 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id CB34A3416A1
for <gentoo-commits@lists.gentoo.org>; Fri, 12 May 2017 08:29:25 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id B5E3B7427
for <gentoo-commits@lists.gentoo.org>; Fri, 12 May 2017 08:29:23 +0000 (UTC)
From: "Hans de Graaff" <graaff@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Hans de Graaff" <graaff@gentoo.org>
Message-ID: <1494577759.70a48b5430bc2c999a94f7eeb16b9b2c01eb595d.graaff@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: www-apache/passenger/
X-VCS-Repository: repo/gentoo
X-VCS-Files: www-apache/passenger/passenger-5.1.4-r1.ebuild www-apache/passenger/passenger-5.1.4.ebuild
X-VCS-Directories: www-apache/passenger/
X-VCS-Committer: graaff
X-VCS-Committer-Name: Hans de Graaff
X-VCS-Revision: 70a48b5430bc2c999a94f7eeb16b9b2c01eb595d
X-VCS-Branch: master
Date: Fri, 12 May 2017 08:29:23 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: c1ff3770-df26-4b51-abb7-4627c41d99d3
X-Archives-Hash: 0024a99779c8a0d46072ed95152ec27d
commit: 70a48b5430bc2c999a94f7eeb16b9b2c01eb595d
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Fri May 12 08:15:36 2017 +0000
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Fri May 12 08:29:19 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70a48b54
www-apache/passenger: fix EAPI=6 and make apache2 optional
Fix EAPI=6 which failed silently due to changes in depend.apache.eclass.
This only seems possible when apache2 is optional, so make this a
USE flag. This should make it possible to use passenger standalone version
without apache, but this is not tested yet.
Fixes bug 618270
Package-Manager: Portage-2.3.5, Repoman-2.3.1
...nger-5.1.4.ebuild => passenger-5.1.4-r1.ebuild} | 32 ++++++++++++----------
1 file changed, 18 insertions(+), 14 deletions(-)
diff --git a/www-apache/passenger/passenger-5.1.4.ebuild b/www-apache/passenger/passenger-5.1.4-r1.ebuild
similarity index 84%
rename from www-apache/passenger/passenger-5.1.4.ebuild
rename to www-apache/passenger/passenger-5.1.4-r1.ebuild
index c99492aca9c..3dc6b74b68b 100644
--- a/www-apache/passenger/passenger-5.1.4.ebuild
+++ b/www-apache/passenger/passenger-5.1.4-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="debug"
+IUSE="apache2 debug"
ruby_add_bdepend "dev-ruby/rake"
@@ -26,7 +26,7 @@ ruby_add_rdepend "
CDEPEND="
>=dev-libs/libuv-1.8.0
net-misc/curl[ssl]
- www-servers/apache[apache2_modules_unixd(+)]"
+ apache2? ( www-servers/apache[apache2_modules_unixd(+)] )"
RDEPEND="${RDEPEND} ${CDEPEND}"
DEPEND="${DEPEND} ${CDEPEND}"
@@ -34,10 +34,11 @@ DEPEND="${DEPEND} ${CDEPEND}"
APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}"
APACHE2_MOD_DEFINE="PASSENGER"
-need_apache2
+want_apache2
pkg_setup() {
use debug && append-flags -DPASSENGER_DEBUG
+ depend.apache_pkg_setup
}
all_ruby_prepare() {
@@ -55,7 +56,6 @@ all_ruby_prepare() {
# Use sed here so that we can dynamically set the documentation directory.
sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \
- -e "s:/usr/lib/apache2/modules/mod_passenger.so:${APACHE_MODULESDIR}/mod_passenger.so:" \
-e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
src/ruby_supportlib/phusion_passenger.rb || die
sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" src/cxx_supportlib/ResourceLocator.h || die
@@ -76,12 +76,14 @@ all_ruby_prepare() {
}
all_ruby_compile() {
- V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
- APXS2="${APXS}" \
- HTTPD="${APACHE_BIN}" \
- FS_LIBDIR='/usr/'$(get_libdir) \
- USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
- ruby -S rake apache2 || die "rake failed"
+ if use apache2 ; then
+ V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
+ APXS2="${APXS}" \
+ HTTPD="${APACHE_BIN}" \
+ FS_LIBDIR='/usr/'$(get_libdir) \
+ USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+ ruby -S rake apache2 || die "rake failed"
+ fi
}
each_ruby_compile() {
@@ -96,11 +98,13 @@ each_ruby_compile() {
}
all_ruby_install() {
- APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so"
- apache-module_src_install
+ if use apache2 ; then
+ APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so"
+ apache-module_src_install
- # Patch in the correct libdir
- sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die
+ # Patch in the correct libdir
+ sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die
+ fi
dodoc CHANGELOG README.md
}