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 }
