Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-apache/passenger/files/
Date: Tue, 14 Feb 2017 21:40:04
Message-Id: 1487108356.b1eaad7341c2c328cf19e7a2f62b994df51b7695.soap@gentoo
1 commit: b1eaad7341c2c328cf19e7a2f62b994df51b7695
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Tue Feb 14 18:29:51 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 14 21:39:16 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1eaad73
7
8 www-apache/passenger: remove unused patches
9
10 Closes: https://github.com/gentoo/gentoo/pull/3968
11
12 .../passenger/files/passenger-4.0.10-gentoo.patch | 48 ----------------------
13 .../passenger/files/passenger-4.0.18-gentoo.patch | 39 ------------------
14 .../passenger/files/passenger-4.0.21-gentoo.patch | 40 ------------------
15 .../passenger/files/passenger-4.0.33-gentoo.patch | 30 --------------
16 .../passenger/files/passenger-5.0.4-gentoo.patch | 30 --------------
17 5 files changed, 187 deletions(-)
18
19 diff --git a/www-apache/passenger/files/passenger-4.0.10-gentoo.patch b/www-apache/passenger/files/passenger-4.0.10-gentoo.patch
20 deleted file mode 100644
21 index 808f988c7a..0000000000
22 --- a/www-apache/passenger/files/passenger-4.0.10-gentoo.patch
23 +++ /dev/null
24 @@ -1,48 +0,0 @@
25 ---- build/packaging.rb.~1~ 2013-07-09 10:10:02.000000000 +0200
26 -+++ build/packaging.rb 2013-07-17 10:25:33.287663252 +0200
27 -@@ -184,7 +184,7 @@
28 - require 'rbconfig'
29 - require 'fileutils'
30 - include RbConfig
31 -- fakeroot = "pkg/fakeroot"
32 -+ fakeroot = ENV['DISTDIR']
33 -
34 - # We don't use CONFIG['archdir'] and the like because we want
35 - # the files to be installed to /usr, and the Ruby interpreter
36 ---- build/packaging.rb.~1~ 2013-07-17 13:06:40.199882060 +0200
37 -+++ build/packaging.rb 2013-07-17 13:18:31.444209611 +0200
38 -@@ -189,9 +189,9 @@
39 - # We don't use CONFIG['archdir'] and the like because we want
40 - # the files to be installed to /usr, and the Ruby interpreter
41 - # on the packaging machine might be in /usr/local.
42 -- fake_rubylibdir = "#{fakeroot}/usr/lib/ruby/vendor_ruby"
43 -+ fake_rubylibdir = "#{fakeroot}#{CONFIG['vendordir']}"
44 - fake_libdir = "#{fakeroot}/usr/lib/passenger"
45 -- fake_native_support_dir = "#{fakeroot}/usr/lib/ruby/#{CONFIG['ruby_version']}/#{CONFIG['arch']}"
46 -+ fake_native_support_dir = "#{fakeroot}#{CONFIG['archdir']}"
47 - fake_agents_dir = "#{fakeroot}/usr/lib/#{GLOBAL_NAMESPACE_DIRNAME}/agents"
48 - fake_helper_scripts_dir = "#{fakeroot}/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/helper-scripts"
49 - fake_resources_dir = "#{fakeroot}/usr/share/passenger"
50 ---- build/packaging.rb.~1~ 2013-07-17 13:19:21.434826846 +0200
51 -+++ build/packaging.rb 2013-07-17 13:21:42.954912287 +0200
52 -@@ -276,10 +276,6 @@
53 - sh "cp bin/#{exe} #{fake_sbindir}/"
54 - end
55 -
56 -- # Apache 2 module
57 -- sh "mkdir -p #{fake_apache2_module_dir}"
58 -- sh "cp #{APACHE2_MODULE} #{fake_apache2_module_dir}/"
59 --
60 - # Ruby extension sources
61 - sh "mkdir -p #{fake_ruby_extension_source_dir}"
62 - sh "cp -R #{PhusionPassenger.ruby_extension_source_dir}/* #{fake_ruby_extension_source_dir}"
63 ---- build/packaging.rb.~1~ 2013-07-17 13:25:51.440038844 +0200
64 -+++ build/packaging.rb 2013-07-17 13:33:30.151365870 +0200
65 -@@ -203,7 +203,6 @@
66 - fake_apache2_module = "#{fake_apache2_module_dir}/mod_passenger.so"
67 - fake_ruby_extension_source_dir = "#{fakeroot}/usr/share/passenger/ruby_extension_source"
68 -
69 -- sh "rm -rf #{fakeroot}"
70 - sh "mkdir -p #{fakeroot}"
71 -
72 - # Ruby sources
73
74 diff --git a/www-apache/passenger/files/passenger-4.0.18-gentoo.patch b/www-apache/passenger/files/passenger-4.0.18-gentoo.patch
75 deleted file mode 100644
76 index 7eb7c33920..0000000000
77 --- a/www-apache/passenger/files/passenger-4.0.18-gentoo.patch
78 +++ /dev/null
79 @@ -1,39 +0,0 @@
80 ---- build/packaging.rb.~1~ 2013-09-14 10:09:56.000000000 +0200
81 -+++ build/packaging.rb 2013-10-05 15:03:51.474846961 +0200
82 -@@ -306,14 +306,14 @@
83 - require 'rbconfig'
84 - require 'fileutils'
85 - include RbConfig
86 -- fakeroot = "pkg/fakeroot"
87 -+ fakeroot = ENV['DISTDIR']
88 -
89 - # We don't use CONFIG['archdir'] and the like because we want
90 - # the files to be installed to /usr, and the Ruby interpreter
91 - # on the packaging machine might be in /usr/local.
92 -- fake_rubylibdir = "#{fakeroot}/usr/lib/ruby/vendor_ruby"
93 -+ fake_rubylibdir = "#{fakeroot}#{CONFIG['vendordir']}"
94 - fake_libdir = "#{fakeroot}/usr/lib/#{GLOBAL_NAMESPACE_DIRNAME}"
95 -- fake_native_support_dir = "#{fakeroot}/usr/lib/ruby/#{CONFIG['ruby_version']}/#{CONFIG['arch']}"
96 -+ fake_native_support_dir = "#{fakeroot}#{CONFIG['archdir']}"
97 - fake_agents_dir = "#{fakeroot}/usr/lib/#{GLOBAL_NAMESPACE_DIRNAME}/agents"
98 - fake_helper_scripts_dir = "#{fakeroot}/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/helper-scripts"
99 - fake_resources_dir = "#{fakeroot}/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}"
100 -@@ -326,7 +326,6 @@
101 - fake_ruby_extension_source_dir = "#{fakeroot}/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/ruby_extension_source"
102 - fake_nginx_module_source_dir = "#{fakeroot}/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/ngx_http_passenger_module"
103 -
104 -- sh "rm -rf #{fakeroot}"
105 - sh "mkdir -p #{fakeroot}"
106 -
107 - # Ruby sources
108 -@@ -405,10 +404,6 @@
109 - end
110 - end
111 -
112 -- # Apache 2 module
113 -- sh "mkdir -p #{fake_apache2_module_dir}"
114 -- sh "cp #{APACHE2_MODULE} #{fake_apache2_module_dir}/"
115 --
116 - # Ruby extension sources
117 - sh "mkdir -p #{fake_ruby_extension_source_dir}"
118 - sh "cp -R #{PhusionPassenger.ruby_extension_source_dir}/* #{fake_ruby_extension_source_dir}"
119
120 diff --git a/www-apache/passenger/files/passenger-4.0.21-gentoo.patch b/www-apache/passenger/files/passenger-4.0.21-gentoo.patch
121 deleted file mode 100644
122 index 30c6ea1b15..0000000000
123 --- a/www-apache/passenger/files/passenger-4.0.21-gentoo.patch
124 +++ /dev/null
125 @@ -1,40 +0,0 @@
126 ---- build/packaging.rb.~1~ 2013-09-14 10:09:56.000000000 +0200
127 -+++ build/packaging.rb 2013-10-05 15:03:51.474846961 +0200
128 -@@ -306,15 +306,15 @@
129 - require 'rbconfig'
130 - require 'fileutils'
131 - include RbConfig
132 -- fakeroot = "pkg/fakeroot"
133 -+ fakeroot = ENV['DISTDIR']
134 -
135 - # We don't use CONFIG['archdir'] and the like because we want
136 - # the files to be installed to /usr, and the Ruby interpreter
137 - # on the packaging machine might be in /usr/local.
138 -- fake_rubylibdir = "#{fakeroot}/usr/lib/ruby/vendor_ruby"
139 -+ fake_rubylibdir = "#{fakeroot}#{CONFIG['vendordir']}"
140 - fake_nodelibdir = "#{fakeroot}/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/node"
141 - fake_libdir = "#{fakeroot}/usr/lib/#{GLOBAL_NAMESPACE_DIRNAME}"
142 -- fake_native_support_dir = "#{fakeroot}/usr/lib/ruby/#{CONFIG['ruby_version']}/#{CONFIG['arch']}"
143 -+ fake_native_support_dir = "#{fakeroot}#{CONFIG['archdir']}"
144 - fake_agents_dir = "#{fakeroot}/usr/lib/#{GLOBAL_NAMESPACE_DIRNAME}/agents"
145 - fake_helper_scripts_dir = "#{fakeroot}/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/helper-scripts"
146 - fake_resources_dir = "#{fakeroot}/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}"
147 -@@ -326,7 +326,6 @@
148 - fake_ruby_extension_source_dir = "#{fakeroot}/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/ruby_extension_source"
149 - fake_nginx_module_source_dir = "#{fakeroot}/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/ngx_http_passenger_module"
150 -
151 -- sh "rm -rf #{fakeroot}"
152 - sh "mkdir -p #{fakeroot}"
153 -
154 - # Ruby sources
155 -@@ -405,10 +404,6 @@
156 - end
157 - end
158 -
159 -- # Apache 2 module
160 -- sh "mkdir -p #{fake_apache2_module_dir}"
161 -- sh "cp #{APACHE2_MODULE} #{fake_apache2_module_dir}/"
162 --
163 - # Ruby extension sources
164 - sh "mkdir -p #{fake_ruby_extension_source_dir}"
165 - sh "cp -R #{PhusionPassenger.ruby_extension_source_dir}/* #{fake_ruby_extension_source_dir}"
166
167 diff --git a/www-apache/passenger/files/passenger-4.0.33-gentoo.patch b/www-apache/passenger/files/passenger-4.0.33-gentoo.patch
168 deleted file mode 100644
169 index 843082b44b..0000000000
170 --- a/www-apache/passenger/files/passenger-4.0.33-gentoo.patch
171 +++ /dev/null
172 @@ -1,30 +0,0 @@
173 ---- build/packaging.rb.~1~ 2014-01-09 07:02:51.715076000 +0100
174 -+++ build/packaging.rb 2014-01-09 07:25:14.182743725 +0100
175 -@@ -361,7 +361,7 @@
176 - psg_ruby_extension_source_dir = "#{fs_datadir}/#{GLOBAL_NAMESPACE_DIRNAME}/ruby_extension_source"
177 - psg_nginx_module_source_dir = "#{fs_datadir}/#{GLOBAL_NAMESPACE_DIRNAME}/ngx_http_passenger_module"
178 -
179 -- fakeroot = "pkg/fakeroot"
180 -+ fakeroot = ENV['DISTDIR']
181 - fake_rubylibdir = "#{fakeroot}#{psg_rubylibdir}"
182 - fake_nodelibdir = "#{fakeroot}#{psg_nodelibdir}"
183 - fake_libdir = "#{fakeroot}#{psg_libdir}"
184 -@@ -379,7 +379,6 @@
185 -
186 - native_packaging_method = ENV['NATIVE_PACKAGING_METHOD'] || "deb"
187 -
188 -- sh "rm -rf #{fakeroot}"
189 - sh "mkdir -p #{fakeroot}"
190 -
191 - # Ruby sources
192 -@@ -464,10 +463,6 @@
193 - end
194 - end
195 -
196 -- # Apache 2 module
197 -- sh "mkdir -p #{File.dirname(fake_apache2_module_path)}"
198 -- sh "cp #{APACHE2_MODULE} #{fake_apache2_module_path}"
199 --
200 - # Ruby extension sources
201 - sh "mkdir -p #{fake_ruby_extension_source_dir}"
202 - sh "cp -R #{PhusionPassenger.ruby_extension_source_dir}/* #{fake_ruby_extension_source_dir}"
203
204 diff --git a/www-apache/passenger/files/passenger-5.0.4-gentoo.patch b/www-apache/passenger/files/passenger-5.0.4-gentoo.patch
205 deleted file mode 100644
206 index 713deb0703..0000000000
207 --- a/www-apache/passenger/files/passenger-5.0.4-gentoo.patch
208 +++ /dev/null
209 @@ -1,30 +0,0 @@
210 ---- build/packaging.rb.orig 2015-03-14 06:52:27.284475606 +0100
211 -+++ build/packaging.rb 2015-03-14 06:52:35.128268388 +0100
212 -@@ -513,7 +513,7 @@
213 - psg_ruby_extension_source_dir = "#{fs_datadir}/#{GLOBAL_NAMESPACE_DIRNAME}/ruby_extension_source"
214 - psg_nginx_module_source_dir = "#{fs_datadir}/#{GLOBAL_NAMESPACE_DIRNAME}/ngx_http_passenger_module"
215 -
216 -- fakeroot = "pkg/fakeroot"
217 -+ fakeroot = ENV['DISTDIR']
218 - fake_rubylibdir = "#{fakeroot}#{psg_rubylibdir}"
219 - fake_nodelibdir = "#{fakeroot}#{psg_nodelibdir}"
220 - fake_libdir = "#{fakeroot}#{psg_libdir}"
221 -@@ -531,7 +531,6 @@
222 -
223 - packaging_method = ENV['NATIVE_PACKAGING_METHOD'] || ENV['PACKAGING_METHOD'] || "deb"
224 -
225 -- sh "rm -rf #{fakeroot}"
226 - sh "mkdir -p #{fakeroot}"
227 -
228 - # Ruby sources
229 -@@ -622,10 +621,6 @@
230 - end
231 - end
232 -
233 -- # Apache 2 module
234 -- sh "mkdir -p #{File.dirname(fake_apache2_module_path)}"
235 -- sh "cp #{APACHE2_MODULE} #{fake_apache2_module_path}"
236 --
237 - # Ruby extension sources
238 - sh "mkdir -p #{fake_ruby_extension_source_dir}"
239 - sh "cp -R #{PhusionPassenger.ruby_extension_source_dir}/* #{fake_ruby_extension_source_dir}"
Report Message
Find on MARC Find on Google Groups