Version bump. Add ruby20.

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

4 files changed, 168 insertions, 2 deletions

diff --git a/www-apache/passenger/ChangeLog b/www-apache/passenger/ChangeLog
index 4baac1a51523..b21784944921 100644
--- a/www-apache/passenger/ChangeLog
+++ b/www-apache/passenger/ChangeLog
@@ -1,6 +1,12 @@
 # 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.74 2013/10/18 09:50:23 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.75 2013/10/23 17:28:37 graaff Exp $
+
+*passenger-4.0.21 (23 Oct 2013)
+
+  23 Oct 2013; Hans de Graaff <graaff@gentoo.org> +passenger-4.0.21.ebuild,
+  +files/passenger-4.0.21-gentoo.patch:
+  Version bump. Add ruby20.
 
   18 Oct 2013; Patrick Lauer <patrick@gentoo.org> metadata.xml:
   Fix typo in maintainer name
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index 3fd926b1b804..85859ecc64d6 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 2.2.15-gentoo-multilib-strict.patch 1278 SHA256 dced348f25d2bb41dff59f51c1dd7a8b6771c81dd699a54170e3627bef12ddea SHA512 19bdd5fd1fe2d9ff0c6797acde965cddf0e997aac87a9572a0516143eeb1ae858b3fd298c186e611df9f6dc1380d3f4d85c7d5bb0141e82fc91e10072ef43c90 WHIRLPOOL 9368f5591cc3a9e6b69eaf0566747cda936fa447d75159dcef88b4869d17ff3568adc04a698f3cb74b8a2216e5c9fd982262b03e4ea2096f8596e4ebff91251b
 AUX 2.2.4-gentoo.patch 1617 SHA256 d90394f0742131f32dc42a9619305b2712bed3967b78d56480447500d190b8ea SHA512 5a80b36b0b62e2a450584f7a7c25f574ad0ae5b9be813ea94069a68583db4bc944e7624a53ac0b1c00eb56329b97f2f37027d530731633fdb4ff4461843a102c WHIRLPOOL 147dddd7762a6a914962283c6e6737e10575da03954e10ea5b70dc80c7e975461f61c21db0fc555ab442689ca3f8d812a252fba6b1a7ae0c95def409bc03e9e9
 AUX 30_mod_passenger-2.0.1.conf 2695 SHA256 65095dd4e633c81d6283faa7f6cd91324b0a964ce73a79f7330c177eaf0d2bff SHA512 251648009a9dac7e87efcb42481c222497a6609e0c72b0ae36adbae75d982c5732549379b0b169c79fd7267609f6f397926dd091a53643055f5540fa1b268d4d WHIRLPOOL d73cf3df89a7147a626bfad9a2ecef304e2dd931b6c6de066842a8930bfdd7451c223f3da881ee38498298f51030ce6b86e22d9443f263d69c2e67cd56488ae3
@@ -9,14 +12,24 @@ AUX passenger-3.0.21-temp-file-usage.patch 5751 SHA256 29ebec7129a0c39ca53c1ddac
 AUX passenger-3.0.8-gentoo.patch 1746 SHA256 d639c675c7d2c3c23001f33513d0758a33e7cdb88406a311608be2f47f746f2e SHA512 bef5911e4f574cd96e67f008517d082ca3dea3e59c3586aaf170fb472f406b4f73a1c583ace527f0f5ab2d0de4cb50c8e9aa4b995eeec4066ea26da93f4a8bc6 WHIRLPOOL 6ca98d8caa9e5ad40edad2c8198c1d1f7c5174c4017bed2bdfe6abdaf8c4f11736b9707f9b11d753e243150458c79bf2915ae4adc46d6dbe7ab6564d99ba7629
 AUX passenger-4.0.10-gentoo.patch 2131 SHA256 113e75b58164f05f901430ed4f426b73028143d1bdab632eab40ded620cbe4db SHA512 c9795cc79f80092828ffc9a53e417fccc11de8e2245de1e502df87302609a2769c1aa14940258484f886441a21857311f0ddf10f601fd3cc914a55bb4553dee4 WHIRLPOOL 6ae2fcd36128daf3af75add417161ae533f1048513939ef768577373eb591f5ba9a402654a852521a3edd151a15a4f4aaa4a5f48fea66146ac217797eb633974
 AUX passenger-4.0.18-gentoo.patch 1682 SHA256 1331a98ed68ed60fb0d49ccbfafc22a755c7d8fa0fcb8aeeec2d52d3d036ed93 SHA512 0e33ff52262976a282800359b5790a4109664f5cc081df893b2f4fb9687aeb97e1419c36d21a89f497faa354fcacbf7336492e8d1cac7ddf7b58234b8f4fa15f WHIRLPOOL f5a00b3d67a5280c43ad9fbad0eeb81df873650a2d794d820043b2f46dbed6a8392924009d713d43d9100c2aa5f9f2398afaa83738f93e79f27c6bd9952d4a14
+AUX passenger-4.0.21-gentoo.patch 1759 SHA256 86070ab8259af80eee024162340fbf53a246b69bf04bd1309e3275323f856bec SHA512 b9dd7932a1c59de80ba2e30d4487ea69df750393b05bbfe32ad1c616afc1e10e04c1d62a6e6c847f87ca22c4abf51c853e9dd55f209bb05106065794ac0389a1 WHIRLPOOL 1735a410352654784fbbb3942fffa88ee9896400b92b0651c062990c8cd614686432ce264092ef6460d217d69b1fc16cee34ffcb7a5362a5aa385cf14e418f54
 DIST passenger-3.0.17.tar.gz 2667619 SHA256 3f1380cdf8342fd3b0df344b4b95e5f7810114dd331e56ca1900eda1f5747f01 SHA512 485a2e9893c81989cd89aae2d4922da4a0391b26687286f56c9b5d2b9b1e8e8e0607376895e7a44f7073743c1ea9f7de335420407145a39b1ab275e01bc77466 WHIRLPOOL e168e599d84d841ef4655905512f4b2e17e07d396793b7ea574cc587df634f4853635b8e9f3c8fefa33a74d6fb952be03284696b0fabeb39cd887b8eaf486cd2
 DIST passenger-3.0.21.tar.gz 2657475 SHA256 82a79a2ff6803e1669ebf806ab320180990ddc096e3d30977ad1c86081b594a5 SHA512 4e92fe8cc679776531a73525ac0dd99612096c1370b4019dcda54aa928cbf6ba17c024124286342209a2b9d1ec9cb22d3783fc6bedc85cb9a0d0fb7561995eec WHIRLPOOL 11f9a5655e7ebcfd9f4a03a63d077126a0766ed7ad92e24494c3515202603782d3a8c999b4662004577d3463de68c040d783d9f93c01f95aa935289c0628780d
 DIST passenger-4.0.10.tar.gz 3623488 SHA256 e83248bb54769fff87ad4778277240153f9972d9d5fb8fcda2eec45feb51dcc6 SHA512 5466f614f4037b03b46dfcf83cf79058771a1ca4c896b66c752aa05c0b9dafe8625e20c713b4b459e20af23200aaba461272c893084b84fe5e7faf5bd1acaab6 WHIRLPOOL 5e9291079d6d663531935e4341f0ffd5584c43782763e18975f22a3e05afaf39ea749cce1313f6ef6f5f67d5720ebb0410fba782576e1d5a162dd1efd4fcee22
 DIST passenger-4.0.18.tar.gz 3905329 SHA256 cd2907c7fa17a82fb88f63892f2d39cb328e01321648f140a00e7980c4e1df32 SHA512 e4c29d2ceb8f5069d8a22c47259935954109033b90569791eeb1978aa585ed1d943b245b7b5042584a20ee814cfca05fac11601eabd785efcfe9eea4c8ebaeb3 WHIRLPOOL 910f7ebe68d4f6c4b859e2a14d54dc1614c54b11b83c28d95e769b7928cc9a1f86fdb937ce1256448e0547eb6183d4df77300d5987ddf274f0e3841af246ce8e
+DIST passenger-4.0.21.tar.gz 4122298 SHA256 3cc7db6de66e8974b5246d7ba0676f5cd3b4dfb257d5f545556ecf046a4a4dc2 SHA512 65460dfa6e61b53e3b2c6f271d56d43f7460f7e1b981a32d8546dcbb62a6f56d0b68e2bdc7bc7292f7ab5418f2f6dcf856606312f85a755d4a904d0700fa1263 WHIRLPOOL d10caa788128afd38eec53495975b2f6226b27504b81b262cd89cb9e4d3f034c738e409bab6cc2e18a4cd89ea0d49ee7a057f95914ed6f3f6ad7a71864a524f6
 EBUILD passenger-3.0.17.ebuild 3025 SHA256 af7a3fee5eb186cdc763e60d8eeb5a73a9dcf3e7ff72d4c019974257cbf046af SHA512 c4c398465fdccd78453d84916baa600e98141f4ff31bed6e1784c8f621e5657d5c71f4fe02c711640b069d2006afa7fb26bf4188971ec98f28f88924a8b3f892 WHIRLPOOL d9dda4ba8b783667ea3c5b1edea5c95b444c435d6305be5b2b59a08fa50c4bf4958a67fe6e280b5607be5c5c622273acaab7558ba4ddd7d1e7d145f8023e8554
 EBUILD passenger-3.0.21-r1.ebuild 3253 SHA256 19b231560cbfe3b4a4bc8303fab0da874927a5f30ad897187fe4028cfaa76bf6 SHA512 4ae46a34d9aa5b5756949380bc6a8a2ebd475852052c374059ec072a5e03c97724a13fbdb9e0b40cadff438c527c8034b3c5293e9c165b4a0360f6190ec5562c WHIRLPOOL f9b99a8e94a842ff2b61eb3b7f57d4d3b264072b95c73c64dcca9482e6c9013396be0ea4310bfa804e07f171340af7df8289c0eee50bc6ed840ce41a7d61292f
 EBUILD passenger-3.0.21.ebuild 3019 SHA256 f198094111a2b47de8e1f17404c3d2daba1d72f131604e2fd92f3405f3cf0d2a SHA512 5b3342d72d3432451547cc51e1476c60820747bf2fa66a31b9bcd37fbe8dd365eed6d609c519f2541a5ba00795c4c9c32d6f4d7ea04a955bca3317060a12f351 WHIRLPOOL dc6e7f0e2ff9ad20b0b38050449cfb23cd8b01b5f427ce286d24c04620af5c7f5ed7c1bfc0d39659f5f9978987a19a25c33ed200f30dfc9790ee291de6fa3889
 EBUILD passenger-4.0.10.ebuild 3363 SHA256 1d6a750abaf02b6cbe92d3fcad92b41c7efa4c58b807b7ec0a5d2f591b290c33 SHA512 02e0bc3910712f6017b5167fff931829646fd49f2d65658e4650978e359d5844013af65fd290c71942cc4f19be6beb3e00f87b209362b39d6911f252f7e44273 WHIRLPOOL 4257d6cb49be09f8fab23a7d81ce3a9d9bbbb279b380fc8224e75d1087e02416a89808857ebb0ee6c11d1280ad7096338109e32fa0080290b8a80a744ed910a1
 EBUILD passenger-4.0.18.ebuild 3389 SHA256 aa353a4ef62ac207cadbcc16f1b70ba80d900d5491c669d880d541c5723c924e SHA512 b4b6a60e9d1e011a475a5d5e780ed256e9fd289dc1cf203cfd99fae31814ae42bc839cc3bf004f63b1e47ba9f89512966ec2270e1b7e4a9b9cd786931a594331 WHIRLPOOL 056d3e536539dbe25406b6d776530df2e0f8dc33b522da3cdda87ceb4e3f30b50291fddac4c14e85eef2c4116954f5f65a0d4c4e04cf5f7316d5eba3151d9ef5
-MISC ChangeLog 11685 SHA256 7c1c899b9ea15a18abede5c7b355e3e3cdd7c3b0537e34ce5859db988492a609 SHA512 9a6352c4f876bac2ccf85823a9712df20f0f96560533451116406626f221676d68bed9c5c432760c1af9057071b0ba37cbe2e9fa05dc9efc7dcdf81eb3f2fd56 WHIRLPOOL bb9e733a2bab7fd186e7633891f90a6df59a4cdbac72746150f90e76cc480220a4f9665035c039f13bcc4bb70dcbcea1bc5c38481e59ed0560d69faf6f9c7821
+EBUILD passenger-4.0.21.ebuild 3396 SHA256 f5271cb4ef23cdd6ccde234b80617c47e33de824966479eca83bfbfab7f490de SHA512 4092647f538fe2ec1748780da86a56caa299df9ccbcd5f7635136bd0cb14f84c3f98d22336d92216bcb4dfde1434f2c8b912c4547044379de577f3e58ac884f7 WHIRLPOOL b44eeaab10e88bcaae6d0565abf99598381ed66d090eb83fe3f681dc257d15dfb1e7d4132b4e46b86bcc83813fe2465a24d3ed5eeac040b4e7c4102dc0ec3aa9
+MISC ChangeLog 11862 SHA256 68354bcc54801d3c52603c691eaafd2f2879f96c27f365d61292a3288b7c743e SHA512 6d7cc992433ae719d95a981762514aaea258656060f3aa23362c9794d15658808db5207cb6a19800c2f1cb13986c8098e03b8f62e4c11cac545edf8b3ae6a473 WHIRLPOOL cf632fcb8a0b800fec809d3c04ba0bffeb9a3a77853d2e4ab33dc59b62d09ec854393641c023617ef9a4a1252459dba27fd2a6bb78b9a15344f9a1ea57b9a221
 MISC metadata.xml 300 SHA256 587c979e6c7d5d5755ee3b7861a7b35038abf4c64633526eef338db1f6477c94 SHA512 fda4f74b7e039c72a54389253a980fcda052d25efe2d43f6cf3d54c67bcfaa20adf9fe74c292bf4774ce2621dd321c2e9f282c7c081e0145cc633de263cf6f4d WHIRLPOOL 8137bbdf332c5394440f888334cd32c0d2a23b12d6c46ae38c7bf74eebad100a25d5000f137a41baf449b607e5ea03688f311268982480ef5d3fe5ac757f76aa
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iF4EAREIAAYFAlJoB0sACgkQiIP6VqMIqNd26QD9FQfv6OCQx29w3LnfeDixYrWJ
+bHZ/Jwa5oZeZEiv6NOMA+wT3+pKHVfqkONOjq5AbiGIi+AaSKzsWgzeuGbmL0/uK
+=dfbv
+-----END PGP SIGNATURE-----
diff --git a/www-apache/passenger/files/passenger-4.0.21-gentoo.patch b/www-apache/passenger/files/passenger-4.0.21-gentoo.patch
new file mode 100644
index 000000000000..30c6ea1b15cd
--- /dev/null
+++ b/www-apache/passenger/files/passenger-4.0.21-gentoo.patch
@@ -0,0 +1,40 @@
+--- build/packaging.rb.~1~	2013-09-14 10:09:56.000000000 +0200
++++ build/packaging.rb	2013-10-05 15:03:51.474846961 +0200
+@@ -306,15 +306,15 @@
+ 	require 'rbconfig'
+ 	require 'fileutils'
+ 	include RbConfig
+-	fakeroot = "pkg/fakeroot"
++	fakeroot = ENV['DISTDIR']
+ 	
+ 	# We don't use CONFIG['archdir'] and the like because we want
+ 	# the files to be installed to /usr, and the Ruby interpreter
+ 	# on the packaging machine might be in /usr/local.
+-	fake_rubylibdir = "#{fakeroot}/usr/lib/ruby/vendor_ruby"
++	fake_rubylibdir = "#{fakeroot}#{CONFIG['vendordir']}"
+ 	fake_nodelibdir = "#{fakeroot}/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/node"
+ 	fake_libdir = "#{fakeroot}/usr/lib/#{GLOBAL_NAMESPACE_DIRNAME}"
+-	fake_native_support_dir = "#{fakeroot}/usr/lib/ruby/#{CONFIG['ruby_version']}/#{CONFIG['arch']}"
++	fake_native_support_dir = "#{fakeroot}#{CONFIG['archdir']}"
+ 	fake_agents_dir = "#{fakeroot}/usr/lib/#{GLOBAL_NAMESPACE_DIRNAME}/agents"
+ 	fake_helper_scripts_dir = "#{fakeroot}/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/helper-scripts"
+ 	fake_resources_dir = "#{fakeroot}/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}"
+@@ -326,7 +326,6 @@
+ 	fake_ruby_extension_source_dir = "#{fakeroot}/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/ruby_extension_source"
+ 	fake_nginx_module_source_dir = "#{fakeroot}/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/ngx_http_passenger_module"
+ 	
+-	sh "rm -rf #{fakeroot}"
+ 	sh "mkdir -p #{fakeroot}"
+ 	
+ 	# Ruby sources
+@@ -405,10 +404,6 @@
+ 		end
+ 	end
+ 	
+-	# Apache 2 module
+-	sh "mkdir -p #{fake_apache2_module_dir}"
+-	sh "cp #{APACHE2_MODULE} #{fake_apache2_module_dir}/"
+-
+ 	# Ruby extension sources
+ 	sh "mkdir -p #{fake_ruby_extension_source_dir}"
+ 	sh "cp -R #{PhusionPassenger.ruby_extension_source_dir}/* #{fake_ruby_extension_source_dir}"
diff --git a/www-apache/passenger/passenger-4.0.21.ebuild b/www-apache/passenger/passenger-4.0.21.ebuild
new file mode 100644
index 000000000000..e580e1056d23
--- /dev/null
+++ b/www-apache/passenger/passenger-4.0.21.ebuild
@@ -0,0 +1,107 @@
+# 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-4.0.21.ebuild,v 1.1 2013/10/23 17:28:37 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby18 ruby19 ruby20"
+
+inherit apache-module flag-o-matic multilib 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="http://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+ruby_add_bdepend "dev-ruby/rake"
+
+ruby_add_rdepend "
+	>=dev-ruby/daemon_controller-1.1.0
+	>=dev-ruby/rack-1.0.0"
+
+CDEPEND=">=dev-libs/libev-4.11 net-misc/curl[ssl]"
+
+RDEPEND="${RDEPEND} ${CDEPEND}"
+DEPEND="${DEPEND} ${CDEPEND}"
+
+APACHE2_MOD_CONF="30_mod_${PN}-4.0.0 30_mod_${PN}"
+APACHE2_MOD_DEFINE="PASSENGER"
+
+need_apache2
+
+pkg_setup() {
+	use debug && append-flags -DPASSENGER_DEBUG
+}
+
+all_ruby_prepare() {
+	epatch "${FILESDIR}"/${PN}-${PV}-gentoo.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)/" \
+		-e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die
+
+	# Use sed here so that we can dynamically set the documentation directory.
+	sed -i -e "s:/usr/share/doc/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."
+
+	# Avoid building documentation to avoid a dependency on mizuho.
+	#sed -i -e 's/, :doc//' build/packaging.rb || die
+	touch doc/*.html || die
+
+	# Use the correct arch-specific lib directory
+	sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' build/packaging.rb || die
+}
+
+all_ruby_compile() {
+	V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \
+	ruby -S rake apache2 || die "rake failed"
+}
+
+each_ruby_compile() {
+	append-flags -fno-strict-aliasing
+
+	V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \
+	${RUBY} -S rake native_support || die "rake failed"
+}
+
+all_ruby_install() {
+	APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so"
+	apache-module_src_install
+
+	# Patch in the correct libdir
+	sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die
+}
+
+each_ruby_install() {
+	DISTDIR="${D}" \
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \
+	${RUBY} -S rake fakeroot || die "rake failed"
+}
+
+pkg_postint() {
+	einfo "The apache module is compiled for the currently eselected ruby."
+	einfo" If you eselect another ruby you must recompile passenger as well."
+}