Eliminate the upstream dependency on Ruby Gems. --- mperham-memcache-client-053890f.orig/lib/memcache.rb +++ mperham-memcache-client-053890f/lib/memcache.rb @@ -7,24 +7,8 @@ require 'digest/sha1' require 'net/protocol' -begin - # Try to use the SystemTimer gem instead of Ruby's timeout library - # when running on something that looks like Ruby 1.8.x. See: - # http://ph7spot.com/articles/system_timer - # We don't want to bother trying to load SystemTimer on jruby and - # ruby 1.9+ - if defined?(JRUBY_VERSION) || (RUBY_VERSION >= '1.9') - require 'timeout' - MemCacheTimer = Timeout - else - require 'system_timer' - MemCacheTimer = SystemTimer - end -rescue LoadError => e - puts "[memcache-client] Could not load SystemTimer gem, falling back to Ruby's slower/unsafe timeout library: #{e.message}" - require 'timeout' - MemCacheTimer = Timeout -end +require 'timeout' +MemCacheTimer = Timeout ## @@ -37,7 +21,7 @@ # The version of MemCache you are using. VERSION = begin - config = YAML.load(File.read(File.dirname(__FILE__) + '/../VERSION.yml')) + config = YAML.load(File.read(File.dirname(__FILE__) + '/memcache/VERSION.yml')) "#{config[:major]}.#{config[:minor]}.#{config[:patch]}" end