--- passenger-2.2.15.ebuild	2010-06-30 20:32:41.000000000 +0200
+++ passenger-2.2.15.ebuild	2010-08-05 10:17:42.000000000 +0200
@@ -2,7 +2,9 @@ 
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/passenger-2.2.15.ebuild,v 1.1 2010/06/30 18:32:41 graaff Exp $
 
-inherit apache-module flag-o-matic ruby
+EAPI=2
+
+inherit apache-module flag-o-matic ruby toolchain-funcs
 
 DESCRIPTION="Passenger (a.k.a. mod_rails) makes deployment of Ruby on Rails applications a breeze"
 HOMEPAGE="http://modrails.com/"
@@ -30,11 +32,13 @@ 
 	use debug && append-flags -DPASSENGER_DEBUG
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/2.2.4-gentoo.patch
 	rm -f bin/passenger-install-apache2-module
+	# respect CC, CXX and LDFLAGS
+	sed -i "s/CC  = \"gcc\"/CC  = \"$(tc-getCC)\"/" Rakefile
+	sed -i "s/CXX = \"g++\"/CXX = \"$(tc-getCXX)\"/" Rakefile
+	sed -i "s/EXTRA_LDFLAGS  = \"\"/EXTRA_LDFLAGS  = \"${LDFLAGS}\"/" Rakefile
 }
 
 src_compile() {