Gentoo Archives: gentoo-commits

From: "Hans de Graaff (graaff)" <graaff@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-apache/passenger/files: passenger-4.0.49-gentoo.patch
Date: Sat, 23 Aug 2014 06:45:03
Message-Id: 20140823064500.1C1983C2C@oystercatcher.gentoo.org
1 graaff 14/08/23 06:45:00
2
3 Added: passenger-4.0.49-gentoo.patch
4 Log:
5 Version bump.
6
7 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)
8
9 Revision Changes Path
10 1.1 www-apache/passenger/files/passenger-4.0.49-gentoo.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/passenger/files/passenger-4.0.49-gentoo.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/passenger/files/passenger-4.0.49-gentoo.patch?rev=1.1&content-type=text/plain
14
15 Index: passenger-4.0.49-gentoo.patch
16 ===================================================================
17 --- build/packaging.rb.~1~ 2013-10-27 00:00:00.000000000 +0200
18 +++ build/packaging.rb 2014-08-23 08:35:20.372738004 +0200
19 @@ -429,7 +429,7 @@
20 psg_ruby_extension_source_dir = "#{fs_datadir}/#{GLOBAL_NAMESPACE_DIRNAME}/ruby_extension_source"
21 psg_nginx_module_source_dir = "#{fs_datadir}/#{GLOBAL_NAMESPACE_DIRNAME}/ngx_http_passenger_module"
22
23 - fakeroot = "pkg/fakeroot"
24 + fakeroot = ENV['DISTDIR']
25 fake_rubylibdir = "#{fakeroot}#{psg_rubylibdir}"
26 fake_nodelibdir = "#{fakeroot}#{psg_nodelibdir}"
27 fake_libdir = "#{fakeroot}#{psg_libdir}"
28 @@ -447,7 +447,6 @@
29
30 native_packaging_method = ENV['NATIVE_PACKAGING_METHOD'] || "deb"
31
32 - sh "rm -rf #{fakeroot}"
33 sh "mkdir -p #{fakeroot}"
34
35 # Ruby sources
36 @@ -532,10 +531,6 @@
37 end
38 end
39
40 - # Apache 2 module
41 - sh "mkdir -p #{File.dirname(fake_apache2_module_path)}"
42 - sh "cp #{APACHE2_MODULE} #{fake_apache2_module_path}"
43 -
44 # Ruby extension sources
45 sh "mkdir -p #{fake_ruby_extension_source_dir}"
46 sh "cp -R #{PhusionPassenger.ruby_extension_source_dir}/* #{fake_ruby_extension_source_dir}"