[gentoo-commits] repo/gentoo:master commit in: www-apache/passenger/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Hans de Graaff" <graaff@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: www-apache/passenger/
Date: Fri, 12 May 2017 08:29:23 +0000 (UTC)	[thread overview]
Message-ID: <1494577759.70a48b5430bc2c999a94f7eeb16b9b2c01eb595d.graaff@gentoo> (raw)

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
 }

next             reply	other threads:[~2017-05-12  8:29 UTC|newest]

Thread overview: 151+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-12  8:29 Hans de Graaff [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-09-28 10:06 [gentoo-commits] repo/gentoo:master commit in: www-apache/passenger/ Hans de Graaff
2025-07-25 10:42 Hans de Graaff
2025-05-31 18:13 Hans de Graaff
2025-05-21 10:56 Arthur Zamarin
2025-05-18 12:13 Arthur Zamarin
2025-04-06 18:21 Hans de Graaff
2025-03-23 17:20 Hans de Graaff
2025-03-21  6:12 Sam James
2025-03-21  4:09 Sam James
2025-02-21  7:23 Hans de Graaff
2025-02-21  7:23 Hans de Graaff
2025-02-15  6:43 Hans de Graaff
2025-02-08  1:08 Jakov Smolić
2025-01-07 17:03 Jakov Smolić
2024-12-10 12:40 Hans de Graaff
2024-11-12 20:08 Hans de Graaff
2024-10-06 11:35 Sam James
2024-08-14  9:48 Hans de Graaff
2024-07-31  6:03 Hans de Graaff
2024-07-07  9:52 Jakov Smolić
2024-07-07  9:52 Jakov Smolić
2024-05-19  5:33 Hans de Graaff
2024-05-19  5:33 Hans de Graaff
2024-05-18 17:23 Hans de Graaff
2024-05-18 17:23 Hans de Graaff
2024-03-06 12:27 Arthur Zamarin
2024-03-06 12:27 Arthur Zamarin
2024-01-23 16:40 Sam James
2024-01-23 16:40 Sam James
2024-01-23 10:54 Hans de Graaff
2023-11-21  6:58 Hans de Graaff
2023-08-28  9:25 Hans de Graaff
2023-07-23 13:43 Sam James
2023-07-23 13:43 Sam James
2023-07-19 11:00 Sam James
2023-07-19 11:00 Sam James
2023-07-08 14:09 Hans de Graaff
2023-06-13  9:39 Hans de Graaff
2023-06-10  4:20 Sam James
2023-06-09 16:35 Arthur Zamarin
2023-01-26  7:49 Hans de Graaff
2023-01-26  7:49 Hans de Graaff
2022-12-23  8:21 Sam James
2022-12-23  8:21 Sam James
2022-12-23  7:48 Hans de Graaff
2022-10-20  6:09 Hans de Graaff
2022-06-08  4:41 Hans de Graaff
2022-05-13  5:39 Hans de Graaff
2022-05-13  5:38 Hans de Graaff
2022-05-08  8:00 Hans de Graaff
2022-05-08  8:00 Hans de Graaff
2022-03-31  5:39 Hans de Graaff
2021-11-08 10:11 Agostino Sarubbo
2021-11-08 10:10 Agostino Sarubbo
2021-11-06  8:05 Hans de Graaff
2021-11-06  8:05 Hans de Graaff
2021-10-03  6:03 Hans de Graaff
2021-07-18  4:48 Hans de Graaff
2021-07-16  6:43 Hans de Graaff
2021-07-16  6:43 Hans de Graaff
2021-06-04  8:23 Hans de Graaff
2021-06-03 16:34 Sam James
2021-06-03 16:34 Sam James
2021-06-03  5:50 Hans de Graaff
2021-04-02 11:16 Hans de Graaff
2021-04-02 11:16 Hans de Graaff
2020-11-20  7:10 Hans de Graaff
2020-09-07  0:50 Thomas Deutschmann
2020-07-22  9:38 Hans de Graaff
2020-07-16  6:47 Hans de Graaff
2020-06-14 20:01 Sergei Trofimovich
2020-06-14 19:59 Sergei Trofimovich
2020-05-31  8:09 Hans de Graaff
2020-05-31  8:09 Hans de Graaff
2019-11-03  9:28 Hans de Graaff
2019-09-18  5:52 Hans de Graaff
2019-09-13  5:51 Hans de Graaff
2019-04-02  4:11 Hans de Graaff
2019-04-02  3:57 Hans de Graaff
2019-04-02  1:37 Thomas Deutschmann
2019-02-26  7:00 Hans de Graaff
2019-01-27 11:18 Hans de Graaff
2019-01-16 19:52 Hans de Graaff
2019-01-15 22:10 Thomas Deutschmann
2019-01-09  9:12 Hans de Graaff
2018-12-02 10:39 Hans de Graaff
2018-12-02 10:39 Hans de Graaff
2018-11-11  8:22 Hans de Graaff
2018-11-07  7:19 Hans de Graaff
2018-08-02  6:20 Hans de Graaff
2018-06-27  5:23 Hans de Graaff
2018-06-20 19:23 Hans de Graaff
2018-06-19 12:55 Thomas Deutschmann
2018-06-18 15:43 Agostino Sarubbo
2018-06-18  5:10 Hans de Graaff
2018-06-13  4:53 Hans de Graaff
2018-05-16  6:01 Hans de Graaff
2018-05-16  6:01 Hans de Graaff
2018-05-16  6:01 Hans de Graaff
2018-05-13  5:47 Hans de Graaff
2018-05-13  5:47 Hans de Graaff
2018-04-05  5:36 Hans de Graaff
2018-03-30  6:13 Hans de Graaff
2018-03-30  6:13 Hans de Graaff
2018-02-28  5:27 Hans de Graaff
2018-01-30  5:19 Hans de Graaff
2018-01-27  7:33 Hans de Graaff
2018-01-26 19:54 Thomas Deutschmann
2018-01-21 17:40 Hans de Graaff
2017-11-24  6:21 Hans de Graaff
2017-11-24  6:21 Hans de Graaff
2017-10-22 20:33 Thomas Deutschmann
2017-10-16 18:57 Hans de Graaff
2017-10-16 15:38 Hans de Graaff
2017-10-16 14:25 Hans de Graaff
2017-09-23  6:31 Hans de Graaff
2017-08-24  5:49 Hans de Graaff
2017-08-19  7:43 Hans de Graaff
2017-08-02  5:25 Hans de Graaff
2017-07-21  6:29 Hans de Graaff
2017-06-17  5:38 Hans de Graaff
2017-05-11  4:13 Hans de Graaff
2017-04-30  8:43 Hans de Graaff
2017-04-27 10:14 Agostino Sarubbo
2017-04-27  5:52 Hans de Graaff
2017-01-27  6:32 Hans de Graaff
2017-01-11  7:20 Hans de Graaff
2016-12-22  7:20 Hans de Graaff
2016-11-06 10:12 Hans de Graaff
2016-11-06 10:12 Hans de Graaff
2016-07-27  5:25 Hans de Graaff
2016-06-24  4:26 Hans de Graaff
2016-06-05  8:39 Hans de Graaff
2016-04-29  5:00 Hans de Graaff
2016-04-10  6:53 Hans de Graaff
2016-04-10  6:53 Hans de Graaff
2016-03-04  7:25 Hans de Graaff
2016-03-04  7:25 Hans de Graaff
2016-02-29 19:11 Hans de Graaff
2016-02-09  6:04 Hans de Graaff
2015-12-24  6:37 Hans de Graaff
2015-12-13  7:54 Hans de Graaff
2015-12-09 11:44 Agostino Sarubbo
2015-12-09 11:43 Agostino Sarubbo
2015-12-09  6:00 Hans de Graaff
2015-10-23  9:35 Hans de Graaff
2015-09-28 17:36 Hans de Graaff
2015-09-28  6:12 Hans de Graaff
2015-09-14 18:10 Hans de Graaff
2015-09-06  6:23 Hans de Graaff

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:c99492aca9 dfblob:3dc6b74b68 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: www-apache/passenger/" )
	(help)

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=1494577759.70a48b5430bc2c999a94f7eeb16b9b2c01eb595d.graaff@gentoo \
    --to=graaff@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