Version bump.

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

4 files changed, 114 insertions, 5 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/Manifest b/www-apache/passenger/Manifest
index 92bb8e6aff0a..de704e7e7b4c 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -6,21 +6,24 @@ AUX 2.2.4-gentoo.patch 1617 RMD160 bb019e88f04a8f04c9c0dfa6ef1d3f908fc5ffcc SHA1
 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
+AUX passenger-3.0.12-ldflags.patch 414 RMD160 19d306e3a7f151a8b3ae9aa41d0bf3758c52c39b SHA1 d00e02d0ffbb7d169282381a4c3f3fa674282faf SHA256 b17694c0a148980e39e60d5582b3e6ee313b63858d4aa827afe71ba1e7c7790e
 AUX passenger-3.0.8-gentoo.patch 1746 RMD160 17f2e03fd29d5c7933f88241734c307f733e714a SHA1 e78e5ff42a1174e8063e0f0b15ed013835dfac48 SHA256 d639c675c7d2c3c23001f33513d0758a33e7cdb88406a311608be2f47f746f2e
 DIST passenger-2.2.15.tar.gz 2128473 RMD160 52d0eb505d6c19e45ccc0dac8d1e675aed505c14 SHA1 dbb2f3346061872a43efc554990d8993172c8ff9 SHA256 95a9f61070d268ecaa311539d8e28b348765ca0e1528665ef928fc4b4bcc1436
 DIST passenger-3.0.11.tar.gz 2378398 RMD160 4e66832d825cb1f5bf06d117d4285c0b0ab54c12 SHA1 6406ecd47b4f100eb98a2cac611793aab15cd31e SHA256 7bbabfafb9d7f4e1beb6a231dea1fe68d540910ceafec6469f51187a43d8ee4e
+DIST passenger-3.0.12.tar.gz 2368176 RMD160 ef2c59456ffd629d8b366edc14ba5638da1f9d13 SHA1 86020b361477d3fc83267352a3c2f5b3c79604d4 SHA256 30e069dd8a311792ecada9df2caecc2a981d1948b88a77329bfa4768c225be04
 DIST passenger-3.0.7.tar.gz 2830376 RMD160 3a22895d72b3f6c9f953e00cb90fe0193494d058 SHA1 f6fd2ff499af9b5ed637505bb3bbe3cc7675b989 SHA256 021972c7f4fecd80042e7fc1d8f19ee3008a5491a3b1d34958b2b7ed42bddc85
 EBUILD passenger-2.2.15-r1.ebuild 1372 RMD160 7b31bf101d0914063e790a710f4945f3ae7794eb SHA1 7b755ee72a6a46fe38ed33c5b3262e64030d1fc7 SHA256 5de33fbcfc3ab8c09f885fa7a15669cc37b942f4df58b55fc831818ad6206a22
 EBUILD passenger-2.2.15.ebuild 1310 RMD160 de65bb9d8c9de2565db681ec0366d6e36189142d SHA1 f3271497fd03e28efbf56640fc7127004fa9e937 SHA256 adfb99efd637dd1f9f6b7d87c751f86de68048349cb602b6a137aecb7794f016
 EBUILD passenger-3.0.11-r1.ebuild 2872 RMD160 cbbb51f2405df605883227b35d65123cd17e03c4 SHA1 ed2856e473134a1fb26a2dfc56d7570c1c3e9935 SHA256 1db2fad17a04f52757c0ba8a418d963218cb761393369e21b8fce1b1b525fd55
 EBUILD passenger-3.0.11.ebuild 2712 RMD160 c251ba9c502a222dbc016c07fd96ab511393171b SHA1 02e9e6ed4fd834a005cc674a86dcc4a4ad6b2e0e SHA256 4a7ed2e1587ee6e8fa976ba1edc2e5601b869501f8f3f6e3476bafd8a48ae040
+EBUILD passenger-3.0.12.ebuild 2867 RMD160 8ca027f96fbfb7c03107420ef4ae1b6ec4dc96de SHA1 4052efd7240bab734fceeedce22a6db9a04e2ec0 SHA256 51cfe4a374226a0eebd85aeb1c401b12937a7b209f2d9dcc5707223138028432
 EBUILD passenger-3.0.7.ebuild 2504 RMD160 c2c94c8a7fbc7cec7aede8460839f2cf49b5c6cc SHA1 197a7b644c8f88b8cf277a274d3584ea6e8037cb SHA256 7c2a9783f6272216032c0c48420b2fb337677765ea5deae87b3b282b6e0c1703
-MISC ChangeLog 7392 RMD160 05dffbdceb36fd4d46661df5deb315795b0095e4 SHA1 13bc3a7c082b04355dedd0df8a0825152a02a230 SHA256 38542b29e9771524122819088ee248bcdc97761ac236016c1bff1a0710caf6b8
+MISC ChangeLog 7559 RMD160 dba37eaa608b0579cd77b4104001a781b0a72f69 SHA1 1b5e4f9f572d90cbc84bc7d32e5a01b5cb9cf091 SHA256 4c50ce763c1fbdf15ac5be48464123c76d3d964f4aca6707e51a898cb96758df
 MISC metadata.xml 256 RMD160 a31638f3b155f4658c0d27de49cd4a68173cf51e SHA1 4856e7084307052aa2e2b014cd7ce4e2bc28ac52 SHA256 683b0a0169c586b4bdacfaba92b87c0679f145a99c115da39c4438f164f76ca5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk97LzsACgkQiIP6VqMIqNfR5AD/dCUoSX7C+buBjuuu3Dhcxfjs
-iaVh7bLS8ouJqZZ5UQMA/RkkptQAxESRbMkGA7vPz8dT9tB0EsaQVDOH22/uM6Lt
-=Tyjy
+iF4EAREIAAYFAk+JFNkACgkQiIP6VqMIqNc1UAD/fHgqyoBA3YZEn1rhdlA6TGEi
+AEKKKAwkFt8nvUCfU6AA/RGFWaksZIFcWi5sQiSMglmED8sMwACi23lr/bwJYYf4
+=tcOj
 -----END PGP SIGNATURE-----
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
+}