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 dev-ruby/rubygems/files: rubygems-1.2.0-setup.patch
Date: Sat, 28 Jun 2008 07:21:50
Message-Id: E1KCUkj-0000Lz-Gq@stork.gentoo.org
1 graaff 08/06/28 07:21:45
2
3 Added: rubygems-1.2.0-setup.patch
4 Log:
5 Version bump: #229327
6 (Portage version: 2.1.4.4)
7
8 Revision Changes Path
9 1.1 dev-ruby/rubygems/files/rubygems-1.2.0-setup.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/rubygems/files/rubygems-1.2.0-setup.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/rubygems/files/rubygems-1.2.0-setup.patch?rev=1.1&content-type=text/plain
13
14 Index: rubygems-1.2.0-setup.patch
15 ===================================================================
16 --- setup.rb.~1~ 2008-06-22 01:51:11.000000000 +0200
17 +++ setup.rb 2008-06-28 09:05:54.923666929 +0200
18 @@ -128,8 +128,8 @@
19 lib_dir = Gem::ConfigMap[site_or_vendor]
20 bin_dir = Gem::ConfigMap[:bindir]
21 else
22 - lib_dir = File.join prefix, 'lib'
23 - bin_dir = File.join prefix, 'bin'
24 + lib_dir = File.join prefix, Gem::ConfigMap[site_or_vendor]
25 + bin_dir = File.join prefix, Gem::ConfigMap[:bindir]
26 end
27 end
28
29 @@ -240,19 +240,6 @@
30 end
31 end
32
33 -# Remove source caches
34 -if install_destdir.empty?
35 - require 'rubygems/source_info_cache'
36 -
37 - user_cache_file = File.join(install_destdir,
38 - Gem::SourceInfoCache.user_cache_file)
39 - system_cache_file = File.join(install_destdir,
40 - Gem::SourceInfoCache.system_cache_file)
41 -
42 - rm_f user_cache_file if File.writable? File.dirname(user_cache_file)
43 - rm_f system_cache_file if File.writable? File.dirname(system_cache_file)
44 -end
45 -
46 # install RDoc
47
48 gem_doc_dir = File.join Gem.dir, 'doc'
49 @@ -262,10 +249,6 @@
50 if File.writable? gem_doc_dir and
51 (not File.exist? rubygems_doc_dir or
52 File.writable? rubygems_doc_dir) then
53 - puts "Removing old RubyGems RDoc and ri"
54 - Dir[File.join(Gem.dir, 'doc', 'rubygems-[0-9]*')].each do |dir|
55 - rm_rf dir
56 - end
57
58 def run_rdoc(*args)
59 begin
60 @@ -277,7 +260,7 @@
61
62 args << '--quiet'
63 args << '--main' << 'README'
64 - args << '.' << 'README' << 'LICENSE.txt' << 'GPL.txt'
65 + args << '.' << 'README'
66
67 r = RDoc::RDoc.new
68 r.document args
69
70
71
72 --
73 gentoo-commits@l.g.o mailing list