Version bump.

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

3 files changed, 106 insertions, 6 deletions

diff --git a/www-apache/passenger/ChangeLog b/www-apache/passenger/ChangeLog
index 6d919f053bb2..094dab7c9c7b 100644
--- a/www-apache/passenger/ChangeLog
+++ b/www-apache/passenger/ChangeLog
@@ -1,6 +1,11 @@
 # 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.49 2012/05/21 10:02:06 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.50 2012/06/15 05:54:33 graaff Exp $
+
+*passenger-3.0.13 (15 Jun 2012)
+
+  15 Jun 2012; Hans de Graaff <graaff@gentoo.org> +passenger-3.0.13.ebuild:
+  Version bump.
 
   21 May 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> passenger-3.0.7.ebuild:
   x86 stable wrt bug #410409
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index 14c87dddec11..0565bbe86741 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 2.2.15-gentoo-multilib-strict.patch 1278 RMD160 bf8c07afd51c60c744b0b362a52236b1c22c6d29 SHA1 5d9fb5b88379b5e634285c739606beebc620ee87 SHA256 dced348f25d2bb41dff59f51c1dd7a8b6771c81dd699a54170e3627bef12ddea
 AUX 2.2.4-gentoo.patch 1617 RMD160 bb019e88f04a8f04c9c0dfa6ef1d3f908fc5ffcc SHA1 b4bc124dcd2c537f65a39b9879ac35a0ec310d34 SHA256 d90394f0742131f32dc42a9619305b2712bed3967b78d56480447500d190b8ea
@@ -11,19 +11,21 @@ AUX passenger-3.0.8-gentoo.patch 1746 RMD160 17f2e03fd29d5c7933f88241734c307f733
 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.13.tar.gz 2654448 RMD160 ed80a4bb7beb03b524f78db222f1d3926206ef4d SHA1 e73703a511d7131d684887154472418bd8aa3871 SHA256 87d5299dd41cb9592bf459d8e4526090a9b37170af9c50c043a20fd43fb09b72
 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 2870 RMD160 9cc9526d3a76eabcb0f0627491ce1f365652a6e0 SHA1 d4d41810288a41e8ba8e906f00287cc2f0ac66db SHA256 547f8eb19bae1807126c87807b4c251837cb53df5ab29f26d6d4cfb1775212b8
 EBUILD passenger-3.0.11.ebuild 2712 RMD160 c251ba9c502a222dbc016c07fd96ab511393171b SHA1 02e9e6ed4fd834a005cc674a86dcc4a4ad6b2e0e SHA256 4a7ed2e1587ee6e8fa976ba1edc2e5601b869501f8f3f6e3476bafd8a48ae040
 EBUILD passenger-3.0.12.ebuild 2992 RMD160 269daed3e9745edd97b02ef7022c414ef45841f5 SHA1 b0a11b45e637fac2d1e4637070c4ddc9fa550de7 SHA256 90bf992ecfb2d85b048b12a8d259b14bbaa5ff5db007ca5319514f01d69b2d3a
+EBUILD passenger-3.0.13.ebuild 2992 RMD160 034612b903da9e78431d8a8c4b3068819b83c151 SHA1 5d336d9811d5cf16427f2aa670905010e946da5a SHA256 ab74db4e9c0c03ed950f3d7aa634bcf9391f0f12f1ab27ed1e5245393873248a
 EBUILD passenger-3.0.7.ebuild 2506 RMD160 9824edfea3c460ebfa440e79cbe60c3ee6ca5319 SHA1 bec16ffe46c3821d2661aa270ccb6f4c94bbaa19 SHA256 a5ec450770867f3d4981f6ba77ea95e91cd6ae22a419a42a471360a1a30083d9
-MISC ChangeLog 8212 RMD160 8ee125914e568e1196075ecb4e0825333a1aac32 SHA1 d6dd73f643fe817d3b1105cd429ea25c259225e4 SHA256 157125cb0fa5e78c11a718157467a1d6dce2b77721bf365faa3cfe636f67af74
+MISC ChangeLog 8334 RMD160 2aa4950fe2ceaab427e1ba5524dcb3f28666dd74 SHA1 d4ed697fcb0625925c7093d590db5a27f57cbf08 SHA256 ce4e4e441ba481f745130efb1e4abecd8e8b24470a962cf7298aa972e870c489
 MISC metadata.xml 256 RMD160 a31638f3b155f4658c0d27de49cd4a68173cf51e SHA1 4856e7084307052aa2e2b014cd7ce4e2bc28ac52 SHA256 683b0a0169c586b4bdacfaba92b87c0679f145a99c115da39c4438f164f76ca5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk+6EpwACgkQuUQtlDBCeQLVBACeJDpSHFglOSZf3I5iebEVcLKF
-nwgAmwekX2YbvUcrLKM31Eg9/6saMdbU
-=U1DD
+iF4EAREIAAYFAk/aziQACgkQiIP6VqMIqNd6dwD/dblJYQLoet7kn/XynPNnDOyy
+knLYS10Lx7WRL1qU83YA/1ybbZvCWir9exLh60K3R4fEqpGdEns3t3ZLnfhA/Kiu
+=zceR
 -----END PGP SIGNATURE-----
diff --git a/www-apache/passenger/passenger-3.0.13.ebuild b/www-apache/passenger/passenger-3.0.13.ebuild
new file mode 100644
index 000000000000..8ad29ccc12f7
--- /dev/null
+++ b/www-apache/passenger/passenger-3.0.13.ebuild
@@ -0,0 +1,93 @@
+# 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.13.ebuild,v 1.1 2012/06/15 05:54:33 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."
+
+	# fix automagic use of asciidoc, bug 413469
+	sed -i -e '/fakeroot/ s/+ Packaging::ASCII_DOCS//' build/packaging.rb || die
+}
+
+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
+}