commit: b1eaad7341c2c328cf19e7a2f62b994df51b7695 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Tue Feb 14 18:29:51 2017 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Tue Feb 14 21:39:16 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1eaad73
www-apache/passenger: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/3968 .../passenger/files/passenger-4.0.10-gentoo.patch | 48 ---------------------- .../passenger/files/passenger-4.0.18-gentoo.patch | 39 ------------------ .../passenger/files/passenger-4.0.21-gentoo.patch | 40 ------------------ .../passenger/files/passenger-4.0.33-gentoo.patch | 30 -------------- .../passenger/files/passenger-5.0.4-gentoo.patch | 30 -------------- 5 files changed, 187 deletions(-) diff --git a/www-apache/passenger/files/passenger-4.0.10-gentoo.patch b/www-apache/passenger/files/passenger-4.0.10-gentoo.patch deleted file mode 100644 index 808f988c7a..0000000000 --- a/www-apache/passenger/files/passenger-4.0.10-gentoo.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- build/packaging.rb.~1~ 2013-07-09 10:10:02.000000000 +0200 -+++ build/packaging.rb 2013-07-17 10:25:33.287663252 +0200 -@@ -184,7 +184,7 @@ - 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 ---- build/packaging.rb.~1~ 2013-07-17 13:06:40.199882060 +0200 -+++ build/packaging.rb 2013-07-17 13:18:31.444209611 +0200 -@@ -189,9 +189,9 @@ - # 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_libdir = "#{fakeroot}/usr/lib/passenger" -- 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/passenger" ---- build/packaging.rb.~1~ 2013-07-17 13:19:21.434826846 +0200 -+++ build/packaging.rb 2013-07-17 13:21:42.954912287 +0200 -@@ -276,10 +276,6 @@ - sh "cp bin/#{exe} #{fake_sbindir}/" - 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}" ---- build/packaging.rb.~1~ 2013-07-17 13:25:51.440038844 +0200 -+++ build/packaging.rb 2013-07-17 13:33:30.151365870 +0200 -@@ -203,7 +203,6 @@ - fake_apache2_module = "#{fake_apache2_module_dir}/mod_passenger.so" - fake_ruby_extension_source_dir = "#{fakeroot}/usr/share/passenger/ruby_extension_source" - -- sh "rm -rf #{fakeroot}" - sh "mkdir -p #{fakeroot}" - - # Ruby sources diff --git a/www-apache/passenger/files/passenger-4.0.18-gentoo.patch b/www-apache/passenger/files/passenger-4.0.18-gentoo.patch deleted file mode 100644 index 7eb7c33920..0000000000 --- a/www-apache/passenger/files/passenger-4.0.18-gentoo.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- build/packaging.rb.~1~ 2013-09-14 10:09:56.000000000 +0200 -+++ build/packaging.rb 2013-10-05 15:03:51.474846961 +0200 -@@ -306,14 +306,14 @@ - 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_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/files/passenger-4.0.21-gentoo.patch b/www-apache/passenger/files/passenger-4.0.21-gentoo.patch deleted file mode 100644 index 30c6ea1b15..0000000000 --- a/www-apache/passenger/files/passenger-4.0.21-gentoo.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- 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/files/passenger-4.0.33-gentoo.patch b/www-apache/passenger/files/passenger-4.0.33-gentoo.patch deleted file mode 100644 index 843082b44b..0000000000 --- a/www-apache/passenger/files/passenger-4.0.33-gentoo.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- build/packaging.rb.~1~ 2014-01-09 07:02:51.715076000 +0100 -+++ build/packaging.rb 2014-01-09 07:25:14.182743725 +0100 -@@ -361,7 +361,7 @@ - psg_ruby_extension_source_dir = "#{fs_datadir}/#{GLOBAL_NAMESPACE_DIRNAME}/ruby_extension_source" - psg_nginx_module_source_dir = "#{fs_datadir}/#{GLOBAL_NAMESPACE_DIRNAME}/ngx_http_passenger_module" - -- fakeroot = "pkg/fakeroot" -+ fakeroot = ENV['DISTDIR'] - fake_rubylibdir = "#{fakeroot}#{psg_rubylibdir}" - fake_nodelibdir = "#{fakeroot}#{psg_nodelibdir}" - fake_libdir = "#{fakeroot}#{psg_libdir}" -@@ -379,7 +379,6 @@ - - native_packaging_method = ENV['NATIVE_PACKAGING_METHOD'] || "deb" - -- sh "rm -rf #{fakeroot}" - sh "mkdir -p #{fakeroot}" - - # Ruby sources -@@ -464,10 +463,6 @@ - end - end - -- # Apache 2 module -- sh "mkdir -p #{File.dirname(fake_apache2_module_path)}" -- sh "cp #{APACHE2_MODULE} #{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/files/passenger-5.0.4-gentoo.patch b/www-apache/passenger/files/passenger-5.0.4-gentoo.patch deleted file mode 100644 index 713deb0703..0000000000 --- a/www-apache/passenger/files/passenger-5.0.4-gentoo.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- build/packaging.rb.orig 2015-03-14 06:52:27.284475606 +0100 -+++ build/packaging.rb 2015-03-14 06:52:35.128268388 +0100 -@@ -513,7 +513,7 @@ - psg_ruby_extension_source_dir = "#{fs_datadir}/#{GLOBAL_NAMESPACE_DIRNAME}/ruby_extension_source" - psg_nginx_module_source_dir = "#{fs_datadir}/#{GLOBAL_NAMESPACE_DIRNAME}/ngx_http_passenger_module" - -- fakeroot = "pkg/fakeroot" -+ fakeroot = ENV['DISTDIR'] - fake_rubylibdir = "#{fakeroot}#{psg_rubylibdir}" - fake_nodelibdir = "#{fakeroot}#{psg_nodelibdir}" - fake_libdir = "#{fakeroot}#{psg_libdir}" -@@ -531,7 +531,6 @@ - - packaging_method = ENV['NATIVE_PACKAGING_METHOD'] || ENV['PACKAGING_METHOD'] || "deb" - -- sh "rm -rf #{fakeroot}" - sh "mkdir -p #{fakeroot}" - - # Ruby sources -@@ -622,10 +621,6 @@ - end - end - -- # Apache 2 module -- sh "mkdir -p #{File.dirname(fake_apache2_module_path)}" -- sh "cp #{APACHE2_MODULE} #{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}"
