gentoo resync : 17.10.2017

3 files changed, 41 insertions, 5 deletions

diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index 3c849c81fa4f..e4d1b2317a8c 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -1,13 +1,14 @@
 AUX 30_mod_passenger-5.0.0.conf 2737 SHA256 c5cd9c6b0a6616c9934a1c1fc9952036a6b4adcd9049e11f5614157f786c736d SHA512 847aa6d0ebb2e4ceaa744fdddf72f22613aeb76df38a36fb3c8b16803222cec116e6d5c23d2173beffd5889ebb8ba0247ffd3b9e900a70d78c2236f00c1a5d4d WHIRLPOOL b7ad6e2cfd1677469c67d8c47e2b53f3087a84477beb4a29d10f71196c7f73590964add0316c97e791ed4e9bf03020d586a118da5c0ba499bb9b5547bf30b6d9
 AUX passenger-5.0.20-gentoo.patch 1057 SHA256 89b0070eeeb91ac79705694903a6145a97e87a60dbaaf35945c60da3645878db SHA512 c5022f3305b413954c75a280fea8b6a59c20a366746d17cdfa100dd7a0b3e4ea051af4c291eca0e71611dedd597903b25e893e7a382a9ee2415657bd55e91779 WHIRLPOOL 38b97ff42d558b9c43581f562dfe2d18b18cc55f5b6bd55912127569f2510462bf1b8f785d90f685f953e848a5b44838487b3f09e57fc24cad436ae331b2eb89
 AUX passenger-5.1.1-isnan.patch 1155 SHA256 52e8c304c841d31b673b1993bfc5a56d6c75db34d84cba6f87a622fe7f0e41c5 SHA512 a80a9a229f1eeb34780236d0b2418fe5d2f57b9ae8c3c4ccdec729806f4afad8979de4ab3ea0834cdb76218192825ee4bfaf02b48f3bda240c2db441bcc870d9 WHIRLPOOL 31cf3615ee67ee60639dbc0e8c4f51faf4c621b816c0bcb2b85b6c61f896ae087640a8dfce175a7a6e6cefafbac9c9345610f737e31c23e7bf1b0f1b1d03c431
+AUX passenger-5.1.11-gentoo.patch 1064 SHA256 6c259660b7e8b8e738a6d5630cf35186d786695b981b26ec4edfd5a5dce9c66f SHA512 7aa098e4c2d4958deaf1369c0570e5f0c5661739047982d428555e5136dc9d5414ce575b3236b30223f14178dd2a4262f62f129d1d383f5c0c78312e80634670 WHIRLPOOL 9dc733547a57d8eec4bbb9d3d751d9f6185e12ca7d063cdd4ed7b9f1a0fcf66f68a11e54c7d0103f5ca6a926568070f6cd2c5fdde59b66dc0cf46f12a9333e71
+DIST passenger-5.1.11.tar.gz 4243340 SHA256 26fc56b2f6d27ed58b948d9601a17a4f61e98fd16349bcb46f3ecebcac3177dd SHA512 7dce496916533f2fcd5cb5931d79308da8adda300a8b8603ce90b92645e69a1283d147976b5aa3408f86ccb71f9e5849bfb68e58a806a8a58529cadda557bccb WHIRLPOOL 071e3a0d1c23f1ac58f0ff93e48357f51aa538e9a76ae4fb115a3cb9ddb0a3eeb5dd6b2a8430bb76acc7cd4158be1d0fe4d640a2402d42a06a632fa87d84fa85
 DIST passenger-5.1.2.tar.gz 5646103 SHA256 7fb03a54650ef5e508895c9e45bc2d8151f6c4811ea6797e81f017fedddfdbab SHA512 88a77c749857a8538ea268f793d2708fa29b8891d2c3197577155f81cb66aa04919c25e713d4f00692051ad385eebaa94729cd30baa68edcf3d17c23bae0acdd WHIRLPOOL 8f115162e2a7c43af20cef1d689290c8a523cce10f617500eeb50ab6a226c203a404fc7ce53fd0e21e63276aa359c5d64b685318be36f79ce165ff598bac8766
 DIST passenger-5.1.6.tar.gz 5215694 SHA256 e897cc5f0ec6446bfdc226404dca4bd29f7418ae92010c389661b9f024a3cf24 SHA512 71d301d2501863951157f55df30ac89f6f9d98e79b554a5ca05ca9a306041ecd8cdc92056220cf6dc9ad02972a102bfc990e3b06f887d27496a8ecbd58e109fa WHIRLPOOL fe6872d0c11803fd0d8875002f37425edc54327709daaa56518ace0ef9f5046836592298ca80ce4929a29e6c0a0adcb237b57a19cd0d73ac096992e742e2a8b5
-DIST passenger-5.1.7.tar.gz 5218093 SHA256 2b40a00a3fdc90a6acf784319f60fd53549f036ffc99fcbb23a0658cb7e2b215 SHA512 f1f67f7912dd3d58ee46c32d1d0584eeb90e95fd5a36bddff62c28674560f1495926a867b20d12a3867d1e81f13c480ed596ba81f78f6241c511b12fcac1de4c WHIRLPOOL 12c1acee83255b19964f505c6238432971d7a80d7937fcfac75cd0645b8626d993365472ca7e622b21fc8144f37f1286e1b58fdfa71836bcd791467416013349
 DIST passenger-5.1.8.tar.gz 5234529 SHA256 fef10e4a34c3faa48306c21c0789ee4d4d56fc0e30205cc470a91b486b7a4a7d SHA512 5baf287e1f2a751409bba99671de2c41656033dc29132b2d964457405284105343fde4c2233c921d7e35794a47eedbf33e3840119a908741b1ed9e6fdc99ec2c WHIRLPOOL 6513b71aadddc9ec5ff4b4c617256a62f1c977b7d0f098982808851afc7703bd4ceed843cf309d07b239dbae97ed4beacaa2130a5dd325b17714df59f3b1f9ee
+EBUILD passenger-5.1.11.ebuild 3981 SHA256 1abf5503c689a4547ce4c0a63252940e3f9d7930d188f4680a341bb00f82ec95 SHA512 bd345120db4a296673d10b9778de4c01b47c7204e0506899cffe5a348caa8eb1ac4d2ae1929c8f442ad0793f234de25915a158b2d72253c0b4ca1ef44aa0440f WHIRLPOOL 7a468471c59da013e39efb6f29a8009c55daf1e4e4634bc275a2f00249ab6a07c020ea536377607da8b73c0a7b2996b2a4666d8373cacb161a0791543b9a9780
 EBUILD passenger-5.1.2.ebuild 3802 SHA256 4e68673b6e194126a37eb8acbb207a91e60219c4a2edfd635dd4508e652c9e9e SHA512 8f8ccf842182cff920f7956e3934e35154bd6235991e50e90bd1629b4f33caa4d480072eddbbc2ad335706bed0f5258ad4de0755beb0c2c89fbf11afcecebc47 WHIRLPOOL 5014b02757779a5cfdc5061ba8d8d5b588ed1e7048ea4b604c3c1a94bd572ab3b8f7c5c775c20dafd87400c305998a7c412bd8c6190e01ea003491058b9eaeb8
 EBUILD passenger-5.1.6.ebuild 3833 SHA256 228c9dbb2b64272213095f96ae7e20b33d643b0a0cde8b6996915f1faf3da95f SHA512 8f384e47cc1efa7c4dabe6dcc42fddd66a2498df22933d4e65fbed124540edb2210f8c0113ae4c2acd3f4d1066fb5eb8bb710f4a23065ef1db6003b48a80ecb6 WHIRLPOOL 1a45c0119c33f5d42c65083adb771d8bfae44daf300269d0734fcfc073e0dd1e665d69708e7f8757e3edb5ad9d500ee6b0d41d6ecdea8114ada29ff7ab1744e4
-EBUILD passenger-5.1.7.ebuild 3834 SHA256 fedb34c679d0f9d9fa450d24c4e8e946b3bf4a9f587e972b4c804bf726f03753 SHA512 e851aae9ff80c75e303dffe7b3ad91a7eecc8a1f2fa706033e5dd919e18f717cf3176c8486aaa783c2b6f6d8fe1aeb94398f4c7ce21e2ce65fddaac0bed86400 WHIRLPOOL a0796aea70300ceb196033367e895e33ea3f60aee258b3d0ef7d710b7d8e1f8cbc1e8f2bb97261d4869dd436567ebb555b622adf0a5dfd3fdbf8cc56bf8c67d8
 EBUILD passenger-5.1.8.ebuild 3827 SHA256 d178ed339b1f895be1457753801d0dd838345ea485f8ab2e1b2227d59b34f542 SHA512 9a6153f12d67e13280b6539dc7f9bc6614a8c793f9484e2df3ed3c4793c37fe6dc7e48f7aca5cad85e2e9abd74455cc2d58010e22ff8a44e3c277e7872d58206 WHIRLPOOL 3cef97673ba0a6d95375368aecc7d7a577d26e2dcadaf781bb421d617fabd8ac5c99a9facc1656afe919f9804401d43db0d253101486c9bfd5d9b15805c1db9d
 MISC ChangeLog 8584 SHA256 923aa06ccf1db42d903c7fd6922f2f1c42d10cd7c4080da6e207fa0af2c69f74 SHA512 efd75c05d7bc141a2ab9634c6b5008071aeb30c7a82dfe4d3ab88d0553852961339be038744c43cc853d5274551c5bb177372bd0b4cab0ed851553da9a04e8bd WHIRLPOOL 6223af82e55988e8b8e666abb1abb3027cb901f86010f5b2e47a6c215cf79d33b540660bb731638f6896ca00feb5c8e5438c9307621f22e06251bca34fa03504
 MISC ChangeLog-2015 17351 SHA256 25abdadae21e308556904475d3a8f0c70274497eb69d917deb0aeb9c0aeed02f SHA512 185db00f89b00e3a6dcd01979266068e3632250b1cd68de5468c759a33bc0f10ddfca36cce4326e693354471b6a485445905abafedc89c8aca6aac18276acd5c WHIRLPOOL f7acd8802839c1d473820c1fde1025e86be2090db5da7ae0392545d298d97d33205b0a7d1ea1e71a7c2eea6026a908bb0fcd281f3c5a53985c03c3bdc325d8ef
diff --git a/www-apache/passenger/files/passenger-5.1.11-gentoo.patch b/www-apache/passenger/files/passenger-5.1.11-gentoo.patch
new file mode 100644
index 000000000000..5a2565c0315d
--- /dev/null
+++ b/www-apache/passenger/files/passenger-5.1.11-gentoo.patch
@@ -0,0 +1,30 @@
+--- build/packaging.rb.~1~	2013-10-27 00:00:00.000000000 +0200
++++ build/packaging.rb	2015-09-28 07:44:04.584236386 +0200
+@@ -575,7 +575,7 @@
+   psg_ruby       = ENV['RUBY'] || "#{fs_bindir}/ruby"
+   psg_free_ruby  = ENV['FREE_RUBY'] || "/usr/bin/env ruby"
+ 
+-  fakeroot = "#{PKG_DIR}/fakeroot"
++  fakeroot = ENV['DISTDIR']
+   fake_rubylibdir = "#{fakeroot}#{psg_rubylibdir}"
+   fake_nodelibdir = "#{fakeroot}#{psg_nodelibdir}"
+   fake_libdir     = "#{fakeroot}#{psg_libdir}"
+@@ -593,7 +593,6 @@
+ 
+   packaging_method = ENV['NATIVE_PACKAGING_METHOD'] || ENV['PACKAGING_METHOD'] || "deb"
+ 
+-  sh "rm -rf #{fakeroot}"
+   sh "mkdir -p #{fakeroot}"
+ 
+   # Ruby sources
+@@ -690,10 +689,6 @@
+     change_shebang("#{fake_sbindir}/#{exe}", shebang)
+   end
+ 
+-  # Apache 2 module
+-  sh "mkdir -p #{File.dirname(fake_apache2_module_path)}"
+-  sh "cp #{APACHE2_TARGET} #{fake_apache2_module_path}"
+-
+   # 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-5.1.7.ebuild b/www-apache/passenger/passenger-5.1.11.ebuild
index 3dc6b74b68bd..9a80d0c6a2a0 100644
--- a/www-apache/passenger/passenger-5.1.7.ebuild
+++ b/www-apache/passenger/passenger-5.1.11.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs
 
@@ -12,7 +12,7 @@ SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="apache2 debug"
 
 ruby_add_bdepend "dev-ruby/rake"
@@ -42,7 +42,7 @@ pkg_setup() {
 }
 
 all_ruby_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.0.20-gentoo.patch
+	epatch "${FILESDIR}"/${PN}-5.1.11-gentoo.patch
 	epatch "${FILESDIR}"/${PN}-5.1.1-isnan.patch
 
 	# Change these with sed instead of a patch so that we can easily use
@@ -73,6 +73,11 @@ all_ruby_prepare() {
 
 	# Fix hard-coded use of AR
 	sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/support/cplusplus.rb || die
+
+	# Make sure apache support is not attempted with -apache2
+	if ! use apache2 ; then
+		sed -i -e '/fakeroot/ s/:apache2, //' build/packaging.rb || die
+	fi
 }
 
 all_ruby_compile() {