Respect LDFLAGS. Install executables in /usr/lib/exec, not /usr/lib.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 108 insertions, 5 deletions

diff --git a/www-apache/passenger/ChangeLog b/www-apache/passenger/ChangeLog
index c2007f26a2e6..8d877df6cc2d 100644
--- a/www-apache/passenger/ChangeLog
+++ b/www-apache/passenger/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apache/passenger
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.28 2010/11/06 11:08:26 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.29 2010/11/07 13:28:04 graaff Exp $
+
+*passenger-3.0.0-r1 (07 Nov 2010)
+
+  07 Nov 2010; Hans de Graaff <graaff@gentoo.org>
+  +passenger-3.0.0-r1.ebuild, +files/passenger-3.0.0-ldflags.patch:
+  Respect LDFLAGS. Install executables in /usr/lib/exec, not /usr/lib.
 
 *passenger-2.2.15-r1 (06 Nov 2010)
 
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index 54d3807fdb96..e3140ab9c9bc 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -5,17 +5,19 @@ AUX 2.2.15-gentoo-multilib-strict.patch 1278 RMD160 bf8c07afd51c60c744b0b362a522
 AUX 2.2.4-gentoo.patch 1617 RMD160 bb019e88f04a8f04c9c0dfa6ef1d3f908fc5ffcc SHA1 b4bc124dcd2c537f65a39b9879ac35a0ec310d34 SHA256 d90394f0742131f32dc42a9619305b2712bed3967b78d56480447500d190b8ea
 AUX 30_mod_passenger-2.0.1.conf 2697 RMD160 2a04e5087b97e07360d59812c6571d8123ad9c64 SHA1 4bb2c583782de3c1ed9f46c5ec5e20244b242ea1 SHA256 f39b8349cd0f9a80bf15182d562e56071ed95f22272cfa0c7fd37045d6e2ded9
 AUX passenger-3.0.0-gentoo.patch 1689 RMD160 3a510af572f07a947748c4024251a957fab728ff SHA1 cf2d3f74e26dea1b4f5309202add483a87d8136d SHA256 81d38f638499b4b3020614165e54647ad1c11630edf43c11f98911b740b15849
+AUX passenger-3.0.0-ldflags.patch 572 RMD160 dbbe8839ad0318ad2730350aa47a622577288ae6 SHA1 6ff3da382026b6fe0c7ff9b179fc21d6c4c5552b SHA256 22b7c85b2c3e0fb2c0275e0a63308cf65aa0ab2a1398c64b95ab149b8cb58392
 DIST passenger-2.2.15.tar.gz 2128473 RMD160 52d0eb505d6c19e45ccc0dac8d1e675aed505c14 SHA1 dbb2f3346061872a43efc554990d8993172c8ff9 SHA256 95a9f61070d268ecaa311539d8e28b348765ca0e1528665ef928fc4b4bcc1436
 DIST passenger-3.0.0.tar.gz 3048705 RMD160 c379346b625d6e6938f8e81c31d7f7524972a878 SHA1 c076de4d739345fa705f35024f51af0f71f408f7 SHA256 6e769fb3c294ad437057438e38982b14aff023c1f914ab281bfd23fcd8681a59
 EBUILD passenger-2.2.15-r1.ebuild 1372 RMD160 7b31bf101d0914063e790a710f4945f3ae7794eb SHA1 7b755ee72a6a46fe38ed33c5b3262e64030d1fc7 SHA256 5de33fbcfc3ab8c09f885fa7a15669cc37b942f4df58b55fc831818ad6206a22
 EBUILD passenger-2.2.15.ebuild 1312 RMD160 2762835b0bce6a8ad981a26e4bd1c6b52106f17d SHA1 ba190e1f3d638e4b980843ee655e46af8649d96b SHA256 13a67f4bd6681833b29a42a52ba4be352c118d0f5dee70b9383cb529269f5150
+EBUILD passenger-3.0.0-r1.ebuild 2491 RMD160 325d59515325d1ced40649b183b932e6ebbf0685 SHA1 e1e4e4c60a68b5a7dc3a1a7b2d38e3adfc5b1750 SHA256 f4e69aa7ef24cd58dbf682713a4dbbf3dc9f38aba0cc1d826b0a4fa078d53eaa
 EBUILD passenger-3.0.0.ebuild 2059 RMD160 5d958eaa6003315d1dc028fe5579b1d4b02b5878 SHA1 1a6e5aa3db1672a7907963f79be87d842ef0f670 SHA256 37819f89e32481a0153dcb39b218f87634c66c58f892eb22bfa9945930151941
-MISC ChangeLog 5446 RMD160 ca5650b2ad6664f864a4e74fe481b26356dfac69 SHA1 df23167f24fd871c1b8083be8f67f415540161bb SHA256 3df78fb51a2af30aa0ddbe27f88577b194a6eee0544338c070c254f7571b94fd
+MISC ChangeLog 5671 RMD160 43f5719de16c35b96dcb82c941c46d6fe6e65e50 SHA1 64209fbe6b578e24b4d2548bc56b2a54911231f0 SHA256 03b5d781a4c5e921b08a872d9543f42357051badb1df71757ef8bf022dbe4722
 MISC metadata.xml 179 RMD160 046a67d39c9a5784800b120b3da44d67caa1f0af SHA1 31e15b20d55994a9989fff90a20847c1e76db2cb SHA256 d07e5a69f0aaee3b23884e0e414fad4aba70b9f4a115d2649714b8f1bd99d9fe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAkzVNzAACgkQZihJkut28Ssj9QEAu0/Jg+CUNG9FEHIHjxyUw0v7
-dfwBVCpdS9KJidkhpxkBAI4fOlfjUgL68psk3jrNy3y51SkjdPBh7h1vsMSbRO3m
-=7sTk
+iF4EAREIAAYFAkzWqXAACgkQZihJkut28SvEAAEAncFJL8eSgyi7wrD6QAf6WoLO
+NgjJtGtM8y/2K635ptsA/j9/9dIMyNurFxVDxZoK0Q8pi0BGt2vzDAQW3eYG6hv6
+=oMq0
 -----END PGP SIGNATURE-----
diff --git a/www-apache/passenger/files/passenger-3.0.0-ldflags.patch b/www-apache/passenger/files/passenger-3.0.0-ldflags.patch
new file mode 100644
index 000000000000..dd378addf7a5
--- /dev/null
+++ b/www-apache/passenger/files/passenger-3.0.0-ldflags.patch
@@ -0,0 +1,13 @@
+--- build/config.rb.~1~	2010-11-07 11:46:22.257690348 +0100
++++ build/config.rb	2010-11-07 12:41:40.601438803 +0100
+@@ -25,7 +25,7 @@
+ 
+ # Extra linker flags that should always be passed to the linker.
+ # Should be included last in the command string, even after PlatformInfo.portability_ldflags.
+-EXTRA_LDFLAGS  = ""
++EXTRA_LDFLAGS  = "#{ENV['LDFLAGS']}"
+ 
+ # Whether to use the vendored libev or the system one.
+-USE_VENDORED_LIBEV = boolean_option("USE_VENDORED_LIBEV", true)
+\ No newline at end of file
++USE_VENDORED_LIBEV = boolean_option("USE_VENDORED_LIBEV", true)
diff --git a/www-apache/passenger/passenger-3.0.0-r1.ebuild b/www-apache/passenger/passenger-3.0.0-r1.ebuild
new file mode 100644
index 000000000000..31137b07b5e3
--- /dev/null
+++ b/www-apache/passenger/passenger-3.0.0-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/passenger-3.0.0-r1.ebuild,v 1.1 2010/11/07 13:28:04 graaff Exp $
+
+EAPI=2
+USE_RUBY="ruby18"
+
+inherit apache-module flag-o-matic ruby-ng
+
+DESCRIPTION="Passenger (a.k.a. mod_rails) makes deployment of Ruby on Rails applications a breeze"
+HOMEPAGE="http://modrails.com/"
+SRC_URI="mirror://rubyforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc"
+
+ruby_add_rdepend "
+	>=dev-ruby/fastthread-1.0.1
+	>=dev-ruby/rack-1.0.0"
+
+RDEPEND="${RDEPEND} >=dev-libs/libev-3.90"
+DEPEND="${DEPEND}
+	>=dev-libs/libev-3.90
+	doc? ( app-text/asciidoc )"
+
+ruby_add_rdepend ">=dev-ruby/daemon_controller-0.2.5 dev-ruby/file-tail"
+
+APACHE2_MOD_CONF="30_mod_${PN}-2.0.1 30_mod_${PN}"
+APACHE2_MOD_DEFINE="PASSENGER"
+
+need_apache2_2
+
+pkg_setup() {
+	use debug && append-flags -DPASSENGER_DEBUG
+}
+
+all_ruby_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+
+	# Use sed here so that we can dynamically set the documentation directory.
+	sed -i -e "s:/usr/share/doc/phusion-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:" \
+		lib/phusion_passenger.rb || die
+	sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" ext/common/ResourceLocator.h || die
+
+	# Don't install a tool that won't work in our setup.
+	sed -i -e '/passenger-install-apache2-module/d' lib/phusion_passenger/packaging.rb || die
+	rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script."
+
+	# Make sure we use the system-provided version.
+	rm -rf ext/libev || die "Unable to remove vendored libev."
+}
+
+each_ruby_compile() {
+	append-flags -fno-strict-aliasing
+
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \
+	rake apache2 native_support || die "rake failed"
+
+	if use doc; then
+		rake doc || die "rake doc failed"
+	fi
+}
+
+each_ruby_install() {
+	DISTDIR="${D}" \
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \
+	rake fakeroot || die "rake failed"
+
+	# TODO: this will create a mess when multiple RUBY_TARGETS have been
+	# selected.
+	APACHE2_MOD_FILE="${S}/ext/apache2/mod_${PN}.so"
+	apache-module_src_install
+}