Cleanup due #22900

(Portage version: 2.1.11.50/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

5 files changed, 0 insertions, 193 deletions

diff --git a/dev-ruby/facter/files/facter-1.5.2-virtual.patch b/dev-ruby/facter/files/facter-1.5.2-virtual.patch
deleted file mode 100644
index 91cb039620fa..000000000000
--- a/dev-ruby/facter/files/facter-1.5.2-virtual.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: facter-1.5.2/lib/facter/virtual.rb
-===================================================================
---- facter-1.5.2.orig/lib/facter/virtual.rb
-+++ facter-1.5.2/lib/facter/virtual.rb
-@@ -7,7 +7,7 @@ Facter.add("virtual") do
-   
-   setcode do 
- 
--    if FileTest.exists?("/proc/user_beancounters")
-+    if FileTest.exists?("/proc/vz/veinfo") && !FileTest.exists?("/proc/vz/version")
-       result = "openvz"
-     end
- 
-@@ -45,12 +45,11 @@ Facter.add("virtual") do
-       result = "vmware_server"
-     end
- 
--    mountexists = system "which mount > /dev/null 2>&1"
--    if $?.exitstatus == 0
--      output = %x{mount}
--      output.each {|p|
--        result = "vserver" if p =~ /\/dev\/hdv1/
--      }
-+    if FileTest.exists?("/proc/self/status")
-+       txt = File.read("/proc/self/status")
-+       if txt =~ /^(s_context|VxID):[[:blank:]]*[1-9]/
-+         result = "vserver"
-+       end
-     end
- 
-     if FileTest.directory?('/proc/virtual')
diff --git a/dev-ruby/facter/files/facter-1.5.7-fqdn.patch b/dev-ruby/facter/files/facter-1.5.7-fqdn.patch
deleted file mode 100644
index 685e8c0ef9ce..000000000000
--- a/dev-ruby/facter/files/facter-1.5.7-fqdn.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-commit dca615c98b864d75e2ac5899d98d04a2bd979eba
-Author: Ohad Levy <ohad.levy@infineon.com>
-Date:   Mon Jan 18 10:42:43 2010 +0800
-
-    fixes #2573, #2085, #1291 - fixes domain and fqdn facts resolution
-    
-    This patch removes the relationship between the domain fact and LDAP/NIS domains.
-    domain fact relates to DNS domain - this will avoid the confusion caused
-    by the LDAP/NIS domain (which might be different to the DNS domain name).
-    Additionally, if hostname is already in long form, it won't try to build
-    the fqdn fact from hostname and domain.
-
-diff --git a/lib/facter/domain.rb b/lib/facter/domain.rb
-index b1bba4d..5dfead0 100644
---- a/lib/facter/domain.rb
-+++ b/lib/facter/domain.rb
-@@ -4,14 +4,14 @@ Facter.add(:domain) do
-         # steps is important
- 
-         Facter.value(:hostname)
--        next $domain if defined? $domain and ! $domain.nil?
-+        # try to fetch the domain from hostname if long hostname is used.
-+        if defined? $fqdn and $fqdn =~ /^([\w-]+)\.(.+)$/
-+          next $2
-+        end
- 
-         domain = Facter::Util::Resolution.exec('dnsdomainname')
-         next domain if domain =~ /.+\..+/
- 
--        domain = Facter::Util::Resolution.exec('domainname')
--        next domain if domain =~ /.+\..+/
--
-         if FileTest.exists?("/etc/resolv.conf")
-             domain = nil
-             search = nil
-diff --git a/lib/facter/fqdn.rb b/lib/facter/fqdn.rb
-index 5ebc5f5..6271995 100644
---- a/lib/facter/fqdn.rb
-+++ b/lib/facter/fqdn.rb
-@@ -1,5 +1,9 @@
- Facter.add(:fqdn) do
-     setcode do
-+        # try to fetch the fqdn from hostname if long hostname is used.
-+        Facter.value(:hostname)
-+        next $fqdn if defined? $fqdn and ! $fqdn.nil?
-+
-         host = Facter.value(:hostname)
-         domain = Facter.value(:domain)
-         if host and domain
-diff --git a/lib/facter/hostname.rb b/lib/facter/hostname.rb
-index 188efa4..c3ca968 100644
---- a/lib/facter/hostname.rb
-+++ b/lib/facter/hostname.rb
-@@ -1,12 +1,13 @@
- Facter.add(:hostname, :ldapname => "cn") do
-     setcode do
-+        require 'socket'
-         hostname = nil
--        name = Facter::Util::Resolution.exec('hostname') or nil
-+        name = Socket.gethostbyname(Socket.gethostname).first
-         if name
-             if name =~ /^([\w-]+)\.(.+)$/
-                 hostname = $1
--                # the Domain class uses this
--                $domain = $2
-+                # the FQDN/Domain facts use this
-+                $fqdn = name
-             else
-                 hostname = name
-             end
diff --git a/dev-ruby/facter/files/facter-1.5.7-ruby19.patch b/dev-ruby/facter/files/facter-1.5.7-ruby19.patch
deleted file mode 100644
index 9bba6ebb2919..000000000000
--- a/dev-ruby/facter/files/facter-1.5.7-ruby19.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -Naur facter-1.5.7.orig/install.rb facter-1.5.7/install.rb
---- facter-1.5.7.orig/install.rb	2009-09-11 13:26:07.000000000 +0900
-+++ facter-1.5.7/install.rb	2010-06-05 12:32:12.000000000 +0900
-@@ -35,11 +35,18 @@
- require 'rbconfig'
- require 'find'
- require 'fileutils'
--require 'ftools' # apparently on some system ftools doesn't get loaded
- require 'optparse'
- require 'ostruct'
- 
- begin
-+    require 'ftools' # apparently on some system ftools doesn't get loaded
-+    $haveftools = true
-+rescue LoadError
-+    puts "ftools not found.  Using FileUtils instead.."
-+    $haveftools = false
-+end
-+
-+begin
-     require 'rdoc/rdoc'
-     $haverdoc = true
- rescue LoadError
-@@ -91,9 +98,15 @@
-     libs.each do |lf|
-         olf = File.join(InstallOptions.site_dir, lf.gsub(/#{strip}/, ''))
-         op = File.dirname(olf)
--        File.makedirs(op, true)
--        File.chmod(0755, op)
--        File.install(lf, olf, 0644, true)
-+        if $haveftools
-+            File.makedirs(op, true)
-+            File.chmod(0755, op)
-+            File.install(lf, olf, 0644, true)
-+        else
-+            FileUtils.makedirs(op, {:mode => 0755, :verbose => true})
-+            FileUtils.chmod(0755, op)
-+            FileUtils.install(lf, olf, {:mode => 0644, :verbose => true})
-+        end
-     end
- end
- 
-@@ -101,9 +114,15 @@
-     man.each do |mf|
-         omf = File.join(InstallOptions.man_dir, mf.gsub(/#{strip}/, ''))
-         om = File.dirname(omf)
--        File.makedirs(om, true)
--        File.chmod(0644, om)
--        File.install(mf, omf, 0644, true)
-+        if $haveftools
-+            File.makedirs(om, true)
-+            File.chmod(0644, om)
-+            File.install(mf, omf, 0644, true)
-+        else
-+            FileUtils.makedirs(om, {:mode => 0755, :verbose => true})
-+            FileUtils.chmod(0755, om)
-+            FileUtils.install(mf, omf, {:mode => 0644, :verbose => true})
-+        end
-         gzip = %x{which gzip}
-         gzip.chomp!
-         %x{#{gzip} -f #{omf}}
diff --git a/dev-ruby/facter/files/facter-1.5.7-virtual.patch b/dev-ruby/facter/files/facter-1.5.7-virtual.patch
deleted file mode 100644
index f3334905cc92..000000000000
--- a/dev-ruby/facter/files/facter-1.5.7-virtual.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: facter-1.5.7/lib/facter/virtual.rb
-===================================================================
---- facter-1.5.7.orig/lib/facter/virtual.rb
-+++ facter-1.5.7/lib/facter/virtual.rb
-@@ -72,7 +72,7 @@ Facter.add("is_virtual") do
- 
-     setcode do
-         case Facter.value(:virtual)
--        when "xenu", "openvzve", "vmware"
-+        when "xenu", "openvzve", "vmware", "vserver"
-             true
-         else 
-             false
diff --git a/dev-ruby/facter/files/facter-1.5.8-freebsd-spec.patch b/dev-ruby/facter/files/facter-1.5.8-freebsd-spec.patch
deleted file mode 100644
index 411780154366..000000000000
--- a/dev-ruby/facter/files/facter-1.5.8-freebsd-spec.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-commit 1125e1e050a3807df2ada4d8cf2d36c22a75ed2b
-Author: Hans de Graaff <hans@degraaff.org>
-Date:   Sat Sep 18 17:31:11 2010 +0200
-
-    Make sure FreeBSD spec also works on systems that have /proc/cpuinfo.
-
-diff --git a/spec/unit/util/virtual.rb b/spec/unit/util/virtual.rb
-index 1e31a2f..cc528d1 100644
---- a/spec/unit/util/virtual.rb
-+++ b/spec/unit/util/virtual.rb
-@@ -101,6 +101,7 @@ describe Facter::Util::Virtual do
-     end
- 
-     it "should detect kvm on FreeBSD" do
-+        FileTest.stubs(:exists?).with("/proc/cpuinfo").returns(false)
-         Facter.fact(:kernel).stubs(:value).returns("FreeBSD")
-         Facter::Util::Resolution.stubs(:exec).with("/sbin/sysctl -n hw.model").returns("QEMU Virtual CPU version 0.12.4")
-         Facter::Util::Virtual.should be_kvm