diff options
Diffstat (limited to 'www-apache/passenger')
| -rw-r--r-- | www-apache/passenger/ChangeLog | 8 | ||||
| -rw-r--r-- | www-apache/passenger/files/passenger-3.0.12-ldflags.patch | 10 | ||||
| -rw-r--r-- | www-apache/passenger/passenger-3.0.12.ebuild | 90 |
3 files changed, 107 insertions, 1 deletions
diff --git a/www-apache/passenger/ChangeLog b/www-apache/passenger/ChangeLog index 55a9d38d5882..aac1afe71070 100644 --- a/www-apache/passenger/ChangeLog +++ b/www-apache/passenger/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for www-apache/passenger # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.41 2012/04/03 17:11:12 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.42 2012/04/14 06:10:22 graaff Exp $ + +*passenger-3.0.12 (14 Apr 2012) + + 14 Apr 2012; Hans de Graaff <graaff@gentoo.org> +passenger-3.0.12.ebuild, + +files/passenger-3.0.12-ldflags.patch: + Version bump. 03 Apr 2012; Hans de Graaff <graaff@gentoo.org> -passenger-3.0.8.ebuild, -passenger-3.0.9.ebuild: diff --git a/www-apache/passenger/files/passenger-3.0.12-ldflags.patch b/www-apache/passenger/files/passenger-3.0.12-ldflags.patch new file mode 100644 index 000000000000..de724eff30a8 --- /dev/null +++ b/www-apache/passenger/files/passenger-3.0.12-ldflags.patch @@ -0,0 +1,10 @@ +--- build/config.rb.~1~ 2010-11-07 11:46:22.257690348 +0100 ++++ build/config.rb 2010-11-07 12:41:40.601438803 +0100 +@@ -25,6 +25,6 @@ + + # 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. diff --git a/www-apache/passenger/passenger-3.0.12.ebuild b/www-apache/passenger/passenger-3.0.12.ebuild new file mode 100644 index 000000000000..e6c37c808c69 --- /dev/null +++ b/www-apache/passenger/passenger-3.0.12.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/passenger-3.0.12.ebuild,v 1.1 2012/04/14 06:10:22 graaff Exp $ + +EAPI=4 +USE_RUBY="ruby18 ruby19" + +inherit apache-module flag-o-matic ruby-ng toolchain-funcs + +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/daemon_controller-0.2.5 + >=dev-ruby/rack-1.0.0" + +USE_RUBY="ruby18" ruby_add_rdepend ">=dev-ruby/fastthread-1.0.1" + +CDEPEND=">=dev-libs/libev-3.90 net-misc/curl[ssl]" + +RDEPEND="${RDEPEND} ${CDEPEND}" +DEPEND="${DEPEND} ${CDEPEND} + doc? ( >=app-text/asciidoc-8.6.5[highlight] )" + +APACHE2_MOD_CONF="30_mod_${PN}-2.0.1 30_mod_${PN}" +APACHE2_MOD_DEFINE="PASSENGER" + +REQUIRED_USE+="ruby_targets_ruby18? ( !ruby_targets_ruby19 ) + ruby_targets_ruby19? ( !ruby_targets_ruby18 )" + +need_apache2_2 + +pkg_setup() { + use debug && append-flags -DPASSENGER_DEBUG +} + +all_ruby_prepare() { + epatch "${FILESDIR}"/${PN}-3.0.8-gentoo.patch + epatch "${FILESDIR}"/${PN}-3.0.12-ldflags.patch + + # Change these with sed instead of a patch so that we can easily use + # the toolchain-funcs methods. + sed -i -e "s/gcc/$(tc-getCC)/" -e "s/g++/$(tc-getCXX)/" build/config.rb || die + + # 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 +} |