diff options
author | 2009-06-19 06:31:54 +0000 | |
---|---|---|
committer | 2009-06-19 06:31:54 +0000 | |
commit | a4b6cfef4bf6db81e458a6aafabb7c36edfdfbb7 (patch) | |
tree | dad0c8c226d17d5edd4d5e4241069078be3fac02 /www-apache/passenger/files | |
parent | Version bump. (diff) | |
download | gentoo-2-a4b6cfef4bf6db81e458a6aafabb7c36edfdfbb7.tar.gz gentoo-2-a4b6cfef4bf6db81e458a6aafabb7c36edfdfbb7.tar.bz2 gentoo-2-a4b6cfef4bf6db81e458a6aafabb7c36edfdfbb7.zip |
Clean out files directory.
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Diffstat (limited to 'www-apache/passenger/files')
-rw-r--r-- | www-apache/passenger/files/1.0.5-gentoo.patch | 84 | ||||
-rw-r--r-- | www-apache/passenger/files/2.0.1-gentoo.patch | 55 | ||||
-rw-r--r-- | www-apache/passenger/files/2.1.2-gentoo.patch | 44 |
3 files changed, 0 insertions, 183 deletions
diff --git a/www-apache/passenger/files/1.0.5-gentoo.patch b/www-apache/passenger/files/1.0.5-gentoo.patch deleted file mode 100644 index 4dc6d751c616..000000000000 --- a/www-apache/passenger/files/1.0.5-gentoo.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff -NurpP passenger-1.0.5.orig/Rakefile passenger-1.0.5/Rakefile ---- passenger-1.0.5.orig/Rakefile 2008-05-07 18:27:24.000000000 +0000 -+++ passenger-1.0.5/Rakefile 2008-06-01 10:57:04.860048239 +0000 -@@ -37,7 +37,7 @@ APR_FLAGS.nil? and raise "Could not find - - CXX = "g++" - THREADING_FLAGS = "-D_REENTRANT" --CXXFLAGS = "#{THREADING_FLAGS} -Wall -g -I/usr/local/include " << MULTI_ARCH_FLAGS -+CXXFLAGS = "#{ENV['CXXFLAGS']} #{THREADING_FLAGS} -Wall" << MULTI_ARCH_FLAGS - LDFLAGS = "" - - -@@ -87,8 +87,7 @@ subdir 'ext/boost/src' do - # processes, sometimes pthread errors will occur. These errors are harmless - # and should be ignored. Defining NDEBUG guarantees that boost::thread() will - # not abort if such an error occured. -- flags = "-O2 -fPIC -I../.. #{THREADING_FLAGS} -DNDEBUG #{MULTI_ARCH_FLAGS}" -- compile_cxx "*.cpp", flags -+ compile_cxx "*.cpp", "#{CXXFLAGS} -fPIC -I../.. -DNDEBUG" - create_static_library "libboost_thread.a", "*.o" - end - -@@ -101,7 +100,7 @@ end - ##### Apache module - - class APACHE2 -- CXXFLAGS = "-I.. -fPIC -g -DPASSENGER_DEBUG #{APR_FLAGS} #{APXS2_FLAGS} #{CXXFLAGS}" -+ CXXFLAGS = "-I.. -fPIC #{APR_FLAGS} #{APXS2_FLAGS} #{CXXFLAGS}" - OBJECTS = { - 'Configuration.o' => %w(Configuration.cpp Configuration.h), - 'Hooks.o' => %w(Hooks.cpp Hooks.h -diff -NurpP passenger-1.0.5.orig/bin/passenger-spawn-server passenger-1.0.5/bin/passenger-spawn-server ---- passenger-1.0.5.orig/bin/passenger-spawn-server 2008-04-03 15:49:06.000000000 +0000 -+++ passenger-1.0.5/bin/passenger-spawn-server 2008-06-01 10:55:57.585311422 +0000 -@@ -16,7 +16,6 @@ - # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - require 'pathname' --$LOAD_PATH.unshift(File.expand_path("#{File.dirname(__FILE__)}/../lib")) - require 'passenger/spawn_manager' - require 'passenger/utils' - -diff -NurpP passenger-1.0.5.orig/lib/passenger/platform_info.rb passenger-1.0.5/lib/passenger/platform_info.rb ---- passenger-1.0.5.orig/lib/passenger/platform_info.rb 2008-04-28 21:34:04.000000000 +0000 -+++ passenger-1.0.5/lib/passenger/platform_info.rb 2008-06-01 10:58:27.772399440 +0000 -@@ -115,7 +115,6 @@ private - else - flags = `#{APXS2} -q CFLAGS`.strip << " -I" << `#{APXS2} -q INCLUDEDIR` - flags.strip! -- flags.gsub!(/-O\d? /, '') - return flags - end - end -@@ -151,7 +150,6 @@ private - else - flags = `#{APR_CONFIG} --cppflags --includes`.strip - libs = `#{APR_CONFIG} --link-ld`.strip -- flags.gsub!(/-O\d? /, '') - return [flags, libs] - end - end -diff -NurpP passenger-1.0.5.orig/lib/passenger/request_handler.rb passenger-1.0.5/lib/passenger/request_handler.rb ---- passenger-1.0.5.orig/lib/passenger/request_handler.rb 2008-05-07 14:05:55.000000000 +0000 -+++ passenger-1.0.5/lib/passenger/request_handler.rb 2008-06-01 10:55:57.585311422 +0000 -@@ -102,7 +102,6 @@ class RequestHandler - NINJA_PATCHING_LOCK = Mutex.new - @@ninja_patched_action_controller = false - -- File.read("#{File.dirname(__FILE__)}/../../Rakefile") =~ /^PACKAGE_VERSION = "(.*)"$/ - PASSENGER_VERSION = $1 - PASSENGER_HEADER = "Phusion Passenger (mod_rails) #{PASSENGER_VERSION}" - if File.exist?("#{File.dirname(__FILE__)}/../../enterprisey.txt") -diff -NurpP passenger-1.0.5.orig/lib/passenger/utils.rb passenger-1.0.5/lib/passenger/utils.rb ---- passenger-1.0.5.orig/lib/passenger/utils.rb 2008-05-07 18:26:59.000000000 +0000 -+++ passenger-1.0.5/lib/passenger/utils.rb 2008-06-01 10:55:57.586311270 +0000 -@@ -20,7 +20,7 @@ require 'etc' - require 'thread' - require 'fastthread' - require 'timeout' --require File.expand_path("#{File.dirname(__FILE__)}/../../ext/passenger/native_support.so") -+require 'native_support' - - module Passenger - diff --git a/www-apache/passenger/files/2.0.1-gentoo.patch b/www-apache/passenger/files/2.0.1-gentoo.patch deleted file mode 100644 index cf8c6420b5ce..000000000000 --- a/www-apache/passenger/files/2.0.1-gentoo.patch +++ /dev/null @@ -1,55 +0,0 @@ -Index: passenger-2.0.1/Rakefile -=================================================================== ---- passenger-2.0.1.orig/Rakefile -+++ passenger-2.0.1/Rakefile -@@ -38,12 +38,8 @@ APR_FLAGS.nil? and raise "Could not find - - CXX = "g++" - THREADING_FLAGS = "-D_REENTRANT" --if OPTIMIZE -- OPTIMIZATION_FLAGS = "-O2 -DNDEBUG" --else -- OPTIMIZATION_FLAGS = "-g -DPASSENGER_DEBUG" --end --CXXFLAGS = "#{THREADING_FLAGS} #{OPTIMIZATION_FLAGS} -Wall -I/usr/local/include #{MULTI_ARCH_FLAGS}" -+OPTIMIZATION_FLAGS = "#{ENV['CXXFLAGS']} -DNDEBUG" -+CXXFLAGS = "#{THREADING_FLAGS} #{OPTIMIZATION_FLAGS} -Wall #{MULTI_ARCH_FLAGS}" - LDFLAGS = "" - - -@@ -156,7 +152,7 @@ subdir 'ext/apache2' do - ] do - create_executable "ApplicationPoolServerExecutable", - 'ApplicationPoolServerExecutable.cpp System.o Utils.o Logging.o', -- "-I.. #{CXXFLAGS} #{LDFLAGS} -DPASSENGER_DEBUG ../boost/src/libboost_thread.a -lpthread" -+ "-I.. #{CXXFLAGS} #{LDFLAGS} ../boost/src/libboost_thread.a -lpthread" - end - - file 'mod_passenger.o' => ['mod_passenger.c'] do -@@ -476,15 +472,15 @@ desc "Create a fakeroot, useful for buil - task :fakeroot => [:apache2, :native_support, :doc] do - require 'rbconfig' - include Config -- 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. -- libdir = "#{fakeroot}/usr/lib/ruby/#{CONFIG['ruby_version']}" -+ libdir = "#{fakeroot}/#{CONFIG['sitedir']}/#{CONFIG['ruby_version']}" - extdir = "#{libdir}/#{CONFIG['arch']}" - bindir = "#{fakeroot}/usr/bin" -- docdir = "#{fakeroot}/usr/share/doc/passenger" -+ docdir = "#{fakeroot}/usr/share/doc/passenger-#{PACKAGE_VERSION}" - libexecdir = "#{fakeroot}/usr/lib/passenger" - - sh "rm -rf #{fakeroot}" -@@ -503,7 +499,6 @@ task :fakeroot => [:apache2, :native_sup - sh "cp bin/* #{bindir}/" - - sh "mkdir -p #{libexecdir}" -- sh "cp ext/apache2/mod_passenger.so #{libexecdir}/" - sh "mv #{fakeroot}/usr/bin/passenger-spawn-server #{libexecdir}/" - sh "cp ext/apache2/ApplicationPoolServerExecutable #{libexecdir}/" - diff --git a/www-apache/passenger/files/2.1.2-gentoo.patch b/www-apache/passenger/files/2.1.2-gentoo.patch deleted file mode 100644 index deec17a62620..000000000000 --- a/www-apache/passenger/files/2.1.2-gentoo.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- Rakefile.orig 2009-03-15 15:15:44.000000000 +0100 -+++ Rakefile 2009-03-15 15:24:51.000000000 +0100 -@@ -39,12 +39,8 @@ - CXX = "g++" - LIBEXT = PlatformInfo.library_extension - # _GLIBCPP__PTHREADS is for fixing Boost compilation on OpenBSD. --if OPTIMIZE -- OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -O2 -DBOOST_DISABLE_ASSERTS" --else -- OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -DPASSENGER_DEBUG -DBOOST_DISABLE_ASSERTS" --end --CXXFLAGS = "-Wall #{OPTIMIZATION_FLAGS}" -+OPTIMIZATION_FLAGS = "#{ENV['CXXFLAGS']} -DNDEBUG" -+CXXFLAGS = "#{OPTIMIZATION_FLAGS} -Wall" - EXTRA_LDFLAGS = "" - - #### Default tasks -@@ -540,15 +536,15 @@ - task :fakeroot => [:apache2, :native_support, :doc] do - require 'rbconfig' - include Config -- 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. -- libdir = "#{fakeroot}/usr/lib/ruby/#{CONFIG['ruby_version']}" -+ libdir = "#{fakeroot}/#{CONFIG['sitedir']}/#{CONFIG['ruby_version']}" - extdir = "#{libdir}/#{CONFIG['arch']}" - bindir = "#{fakeroot}/usr/bin" -- docdir = "#{fakeroot}/usr/share/doc/phusion_passenger" -+ docdir = "#{fakeroot}/usr/share/doc/passenger-#{PACKAGE_VERSION}" - libexecdir = "#{fakeroot}/usr/lib/phusion_passenger" - - sh "rm -rf #{fakeroot}" -@@ -567,7 +563,6 @@ - sh "cp bin/* #{bindir}/" - - sh "mkdir -p #{libexecdir}" -- sh "cp ext/apache2/mod_passenger.so #{libexecdir}/" - sh "mv #{fakeroot}/usr/bin/passenger-spawn-server #{libexecdir}/" - sh "cp ext/apache2/ApplicationPoolServerExecutable #{libexecdir}/" - |