Version bump.

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

3 files changed, 107 insertions, 5 deletions

diff --git a/www-apache/passenger/ChangeLog b/www-apache/passenger/ChangeLog
index 0fb7df148291..1c7bfa82a2f7 100644
--- a/www-apache/passenger/ChangeLog
+++ b/www-apache/passenger/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apache/passenger
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.63 2013/05/06 17:04:07 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.64 2013/05/30 06:07:45 graaff Exp $
+
+*passenger-3.0.21 (30 May 2013)
+
+  30 May 2013; Hans de Graaff <graaff@gentoo.org> +passenger-3.0.21.ebuild:
+  Version bump.
 
   06 May 2013; Hans de Graaff <graaff@gentoo.org> -passenger-3.0.7.ebuild,
   -passenger-3.0.18.ebuild:
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index c140514d18dc..53288ed46592 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -11,16 +11,18 @@ AUX passenger-3.0.8-gentoo.patch 1746 SHA256 d639c675c7d2c3c23001f33513d0758a33e
 DIST passenger-2.2.15.tar.gz 2128473 SHA256 95a9f61070d268ecaa311539d8e28b348765ca0e1528665ef928fc4b4bcc1436 SHA512 a82f7d39d0a1053fd4b63c7d1464db54d229d0b42b326afc11dddef680938f522ba20b3bbd39ebb0241407b669dcdb7478c58420ca2f2225a9b2daa03ce8c17e WHIRLPOOL 0755d39c7d5abe804c7b47fba1fe8c309f1ce6cf8f3d4c419694559538842d9b2be69bbe79a2635c86de70dc8c286d6c9f53b1f3ee44963dea24cf3502337d1d
 DIST passenger-3.0.17.tar.gz 2667619 SHA256 3f1380cdf8342fd3b0df344b4b95e5f7810114dd331e56ca1900eda1f5747f01 SHA512 485a2e9893c81989cd89aae2d4922da4a0391b26687286f56c9b5d2b9b1e8e8e0607376895e7a44f7073743c1ea9f7de335420407145a39b1ab275e01bc77466 WHIRLPOOL e168e599d84d841ef4655905512f4b2e17e07d396793b7ea574cc587df634f4853635b8e9f3c8fefa33a74d6fb952be03284696b0fabeb39cd887b8eaf486cd2
 DIST passenger-3.0.19.tar.gz 2663368 SHA256 7a4dc7eeaca1ac81636167ebfe1cf69b18fc2f09f52a882b73c05a9e9ec12d98 SHA512 379506c1ef6eab01021a570c3420d7c50d4b3a8d1e0ab493dfa70dd58ae64190eb2bb30a6290db8385d35b4b1eaadb73a3ace998ea32c7ba20bcfe0809077f1d WHIRLPOOL 51e73bf6e0077f0e88cbbfe6a2edd5efad738880ab439ea32262536e217e053be24fe86d97462fa2d853372c7d7ccf6e088959c64de4dd6d5e1c02ab80211fd4
+DIST passenger-3.0.21.tar.gz 2657475 SHA256 82a79a2ff6803e1669ebf806ab320180990ddc096e3d30977ad1c86081b594a5 SHA512 4e92fe8cc679776531a73525ac0dd99612096c1370b4019dcda54aa928cbf6ba17c024124286342209a2b9d1ec9cb22d3783fc6bedc85cb9a0d0fb7561995eec WHIRLPOOL 11f9a5655e7ebcfd9f4a03a63d077126a0766ed7ad92e24494c3515202603782d3a8c999b4662004577d3463de68c040d783d9f93c01f95aa935289c0628780d
 EBUILD passenger-2.2.15-r1.ebuild 1372 SHA256 5de33fbcfc3ab8c09f885fa7a15669cc37b942f4df58b55fc831818ad6206a22 SHA512 da9358bd38247437860aba55b8ab26c515c337298ff5ab69a066047d961db978576bcfde9ec4316ab6714c9748d838281b6df773c307cc55b66d1cc849ae0b8e WHIRLPOOL 0dbe621e85f8d3ad6fcaa9163cd593c8e82799582544f95b65218ba72ae0163c1b6eb45e575f4ed40d6e1df145f3a4aca1131c77e85c04b61cf3095784eb6ad2
 EBUILD passenger-2.2.15.ebuild 1310 SHA256 adfb99efd637dd1f9f6b7d87c751f86de68048349cb602b6a137aecb7794f016 SHA512 a928a41badb0cb122bd38476b1176b89dcabae27e3cc1907247086a27bf3b12252962f2b11f5f9f88d502a1a7204d394abd12d9bc2b01a4fce9cd2f8b898ee68 WHIRLPOOL 44db92c92505b434faf9488ffeb6bd715de02d51270b25afcbe40c5f1ef306856143b71ecc296dfa6cae28d4d9158577e1230e29732893dd62e9a03eb502a5f3
 EBUILD passenger-3.0.17.ebuild 3025 SHA256 af7a3fee5eb186cdc763e60d8eeb5a73a9dcf3e7ff72d4c019974257cbf046af SHA512 c4c398465fdccd78453d84916baa600e98141f4ff31bed6e1784c8f621e5657d5c71f4fe02c711640b069d2006afa7fb26bf4188971ec98f28f88924a8b3f892 WHIRLPOOL d9dda4ba8b783667ea3c5b1edea5c95b444c435d6305be5b2b59a08fa50c4bf4958a67fe6e280b5607be5c5c622273acaab7558ba4ddd7d1e7d145f8023e8554
 EBUILD passenger-3.0.19.ebuild 3024 SHA256 d631d932a86c1d361f4dd2565e14064f87871d4f3e7df9fdafb4498694090147 SHA512 be8491bf8433b005801180c343f64ec3abb3fa8c7a065e6c94bb5a5b136d81ddd0e2f8db921cf4c29b52635f7419735ea87b221c16f51796a77f2fdae604e284 WHIRLPOOL 2ac49771d434ba1bb2f83828da6fcfa92cebe8d3679e0b8c121a8ee13b2c8ae59fb0261ca2b75e32eb6e7859be56cd7fc8476379fff9f3fe049c6e17425a9d39
-MISC ChangeLog 10063 SHA256 7d6eea12a509c7bffc82fa733e06e687b2a2491c23697dfe6b43b31c94e675de SHA512 d192526c18eec0787747f3163a717e6b309d108e3529a691f04e5bd8f4941436548324259782427d52338e55926b15382933b6acf2d6ca4cf8df56a40c184e28 WHIRLPOOL dc1e38dc1645f235d9d0928b79e95bc336b4981b907a9fa0d7ac939934f606135887ddba2200ab5cf538c70e3b1f2141e972b3f0d19d106b053ffbf67a981214
+EBUILD passenger-3.0.21.ebuild 3024 SHA256 1bd58cc47a46d9449fa91c2d16c3a40dbaf7a64ac5880a90b4fb8f5daea98893 SHA512 9808093a97c8f7668847898f0e5cd02068fb68a758832d501d02e012d269c599622decb9364604ec1e6a9faf6f48b263a76468aa8e71de53d254f473a1d73029 WHIRLPOOL d16ec5a8ea3fc3798da3225eef51b2a611c526fab7fc7a3955f24116c7bd329af44fcb63526f13828c450127216025b6ffb3ae39acd03a03b2d6364a61f456db
+MISC ChangeLog 10189 SHA256 ab68d65f0c8310ac4116c6dc89e77428b48154ba32c3cce4fefe47b6198caa7f SHA512 ef2d6729e731e9b0ebab0d7b9a6b69ee6bda17a03c7b578ea6909d2872583d0408170a7f6a6f2d0b1f7f280f52f8f45621fa96c2cd5cfab8c1bfc10cad8fc0bf WHIRLPOOL 4ab2ed2d623cab8587a56dfc41d7ff2857ba4f97ef7198ca6ef7ef9277ef18d89eb98b0db1c4a682e1dee96ba41b5c01728286f9772f2c97c87abdf5dd7cbef7
 MISC metadata.xml 235 SHA256 426d2ea49777c4552d4d17e05c35cb094f22210fc91574ed3f282ded828fecb1 SHA512 b5127ae32b50e1b3fc0e0f4cd13914e8bb625084c19156194027fe7b4687015768d05c2b28fac3fe0b588c6503bb13b48629d82ab321dff3b614df8eb6250921 WHIRLPOOL e5ae624478bfd2f882ca1dc4b3802910a04031e3612630b90a654b223a590b1b0b3b208dc788f5347e0d0c42c8559a23c94274907cbd8b0b1b06ba4f6e1012d2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlGH4o4ACgkQiIP6VqMIqNcEDwD+MSBSD/Hp2Si9kkkGS5ugJVV5
-7Q6NKW/hng3Z9HRClV0A/0NGjowgyJFUoXDlNPeI40s32iIgsIzLzy1NDeZEqrsX
-=p3J+
+iF4EAREIAAYFAlGm7LIACgkQiIP6VqMIqNc6igEAgqHZALzmwS4+S419RHXleQkw
+1tXvN0ikoqg0zPZ27CEA/RD2q/fTseBlVl/61m2Jx4magqunnKSHL8TpTuTkBBBh
+=Jzbr
 -----END PGP SIGNATURE-----
diff --git a/www-apache/passenger/passenger-3.0.21.ebuild b/www-apache/passenger/passenger-3.0.21.ebuild
new file mode 100644
index 000000000000..6fb78373f165
--- /dev/null
+++ b/www-apache/passenger/passenger-3.0.21.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/passenger-3.0.21.ebuild,v 1.1 2013/05/30 06:07:45 graaff Exp $
+
+EAPI=5
+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_bdepend "dev-ruby/rake"
+
+ruby_add_rdepend "
+	>=dev-ruby/daemon_controller-1.0.0
+	>=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
+
+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
+}