Index: libfeedtools-ruby-0.2.29+dfsg1/lib/feed_tools/database_feed_cache.rb
===================================================================
--- libfeedtools-ruby-0.2.29+dfsg1.orig/lib/feed_tools/database_feed_cache.rb	2009-06-29 13:49:27.000000000 +0200
+++ libfeedtools-ruby-0.2.29+dfsg1/lib/feed_tools/database_feed_cache.rb	2009-06-29 13:57:39.000000000 +0200
@@ -21,7 +21,6 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-require 'rubygems'
 require 'active_record'
 
 #= database_feed_cache.rb
@@ -137,4 +136,4 @@
       return true
     end
   end
-end
\ No newline at end of file
+end
Index: libfeedtools-ruby-0.2.29+dfsg1/lib/feed_tools.rb
===================================================================
--- libfeedtools-ruby-0.2.29+dfsg1.orig/lib/feed_tools.rb	2009-06-29 13:49:27.000000000 +0200
+++ libfeedtools-ruby-0.2.29+dfsg1/lib/feed_tools.rb	2009-06-29 14:00:24.000000000 +0200
@@ -108,17 +108,13 @@
     raise
   end
 
-  require 'rubygems'
-  
-  if !defined?(Builder)
-    gem('builder', '>= 1.2.4')
-    require 'builder'
-  end
-  
-  if !defined?(ActiveRecord)
-    gem('activerecord', '>= 1.11.1')
-    require 'active_record'
+  if defined?(DEVELOPER_MODE) and DEVELOPER_MODE
+    require 'rubygems'
+    gem('builder', '>= 1.2.4') if !defined?(Builder)
+    gem('activerecord', '>= 1.11.1') if !defined?(ActiveRecord)
   end
+  require 'builder'
+  require 'active_record'
 
   # Preload optional libraries.
   begin
@@ -155,15 +151,10 @@
   require 'yaml'
   require 'base64'
 
-  begin
-    gem('uuidtools', '>= 0.1.2')
-  rescue Gem::LoadError
-    begin
-      require 'uuidtools'
-    rescue Object
-      raise unless defined? UUID
-    end
+  if defined?(DEVELOPER_MODE) and DEVELOPER_MODE
+    gem('uuidtools', '>= 0.1.2') if !defined?(UUID)
   end
+  require 'uuidtools'
   
   require 'feed_tools/monkey_patch'
   
@@ -378,4 +369,4 @@
     FeedTools.feed_cache.initialize_cache
   end
 rescue
-end
\ No newline at end of file
+end
Index: libfeedtools-ruby-0.2.29+dfsg1/lib/feed_tools/vendor/html5/lib/html5/treebuilders/hpricot.rb
===================================================================
--- libfeedtools-ruby-0.2.29+dfsg1.orig/lib/feed_tools/vendor/html5/lib/html5/treebuilders/hpricot.rb	2009-06-29 13:49:27.000000000 +0200
+++ libfeedtools-ruby-0.2.29+dfsg1/lib/feed_tools/vendor/html5/lib/html5/treebuilders/hpricot.rb	2009-06-29 13:57:39.000000000 +0200
@@ -1,5 +1,4 @@
 require 'html5/treebuilders/base'
-require 'rubygems'
 require 'hpricot'
 require 'forwardable'
 
