Clean out files directory.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

5 files changed, 9 insertions, 191 deletions

diff --git a/www-apache/passenger/ChangeLog b/www-apache/passenger/ChangeLog
index f41f72455c64..022a8b496412 100644
--- a/www-apache/passenger/ChangeLog
+++ b/www-apache/passenger/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apache/passenger
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.11 2009/06/19 06:29:33 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.12 2009/06/19 06:31:53 graaff Exp $
+
+  19 Jun 2009; Hans de Graaff <graaff@gentoo.org> -files/1.0.5-gentoo.patch,
+  -files/2.0.1-gentoo.patch, -files/2.1.2-gentoo.patch:
+  Remove files that are no longer used.
 
 *passenger-2.2.3 (19 Jun 2009)
 
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index f134c6f25bdf..4879f99abbed 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -1,9 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 1.0.5-gentoo.patch 3658 RMD160 448b31ea9a8ef8dbf24e64ccbe425c76941e4a4c SHA1 fe875ef07f07127e8d8781b3379b9af895948df9 SHA256 16a96e13f756762eb71e0fa92f11d335620a8ffba8b12bbdbeaf8b0484760e34
-AUX 2.0.1-gentoo.patch 2152 RMD160 ecb1691c26d50ed2a7ff2877003db9b2d8b0f9c2 SHA1 42873c6c22471e5614d658b2c99be7679ff929e7 SHA256 9863ceedfdd30feb74429aa844637e14a46c1d7700719a30af82316f15e163fd
-AUX 2.1.2-gentoo.patch 1678 RMD160 24e42c01a88c83e6c6d5d914d18f9904d7366d3c SHA1 715ea4ba8c506e7b82843777175fc85e92112fd7 SHA256 08cbbefaf16f4418e364d5381b9de37d71809655747b4bc98634568c4e668b60
 AUX 2.2.2-gentoo.patch 1617 RMD160 bb019e88f04a8f04c9c0dfa6ef1d3f908fc5ffcc SHA1 b4bc124dcd2c537f65a39b9879ac35a0ec310d34 SHA256 d90394f0742131f32dc42a9619305b2712bed3967b78d56480447500d190b8ea
 AUX 2.2.3-gentoo.patch 1617 RMD160 bb019e88f04a8f04c9c0dfa6ef1d3f908fc5ffcc SHA1 b4bc124dcd2c537f65a39b9879ac35a0ec310d34 SHA256 d90394f0742131f32dc42a9619305b2712bed3967b78d56480447500d190b8ea
 AUX 30_mod_passenger-2.0.1.conf 2697 RMD160 2a04e5087b97e07360d59812c6571d8123ad9c64 SHA1 4bb2c583782de3c1ed9f46c5ec5e20244b242ea1 SHA256 f39b8349cd0f9a80bf15182d562e56071ed95f22272cfa0c7fd37045d6e2ded9
@@ -12,12 +9,12 @@ DIST passenger-2.2.2.tar.gz 1693895 RMD160 e83f9c82454cfdcf1e7a1d6e6bfdfdf9317ce
 DIST passenger-2.2.3.tar.gz 1789111 RMD160 71fc90e98a36d2ff5fdb2aac8fe497dbebf14cf8 SHA1 a51aae8f72fba408d511ee09f05a26db04951fd3 SHA256 fcdbe49f1c34de150bdd5ccca99fa154cd2c545179fd1d988f491f759357b57d
 EBUILD passenger-2.2.2.ebuild 1386 RMD160 49b0e197a9849fff08acfd71f97ce7012febcb30 SHA1 194b041cadc09a6dae33612558656ba97795d485 SHA256 ee094ce4fb1b209fea47ffd688ef4ac66baf00d28bb59ab4e110b791b8a32013
 EBUILD passenger-2.2.3.ebuild 1383 RMD160 9f0450b78c37a440b518240adf75248bb49f5c0f SHA1 a86f98f02be631cc9a916f1aa6690bc78a00f2ef SHA256 3dd4217b36e9e8011f5626bcb4ec267704770f8139d3622e09ab412745d8626e
-MISC ChangeLog 2219 RMD160 e9c27069ac1cc6829137ab00de3a19bc783519cd SHA1 9c183fd69a6b44b08bcd6b280ffc73db948cd263 SHA256 79e9bd9d0b6dda143ac3d1229e64e5f7616b5b20a46783532795c759c5250a59
+MISC ChangeLog 2393 RMD160 65daf4f5991c0c2619b0f131c8dc0435bd581842 SHA1 36c74553b2fe707fb809ee0fbdc90ca71e6eacd0 SHA256 00602c5c12711e409f6c7b14f1e2d5df7b268420942caf90d10d27b8c717500d
 MISC metadata.xml 179 RMD160 046a67d39c9a5784800b120b3da44d67caa1f0af SHA1 31e15b20d55994a9989fff90a20847c1e76db2cb SHA256 d07e5a69f0aaee3b23884e0e414fad4aba70b9f4a115d2649714b8f1bd99d9fe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAko7MFMACgkQVYU2Ai8K93fh9gCfSB9vYK88vCKlOUv18l5JCBbc
-pb0AoMkgVks8rNU4tZ+GTCzm6QKlVQ7g
-=o86P
+iEYEARECAAYFAko7MN8ACgkQVYU2Ai8K93fo0ACbBtnRdA92O/qPgEpssbTQzhgp
+2X4AoM6VbLIbBQRlWnE23enjJ3Y0EGQ9
+=gXaX
 -----END PGP SIGNATURE-----
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}/"
-