Store the opt record so we don't have to keep reconstructing it

Library/Homebrew/keg.rb

@@ -88,7 +88,7 @@ class Keg
     raise NotAKegError, "#{path} is not inside a keg"
   end
 
-  attr_reader :path, :name, :linked_keg_record
+  attr_reader :path, :name, :linked_keg_record, :opt_record
   protected :path
 
   def initialize path
@@ -97,6 +97,7 @@ class Keg
     @path = path
     @name = path.parent.basename.to_s
     @linked_keg_record = HOMEBREW_LIBRARY.join("LinkedKegs", name)
+    @opt_record = HOMEBREW_PREFIX.join("opt", name)
   end
 
   def fname
@@ -166,10 +167,9 @@ class Keg
     path.rmtree
     path.parent.rmdir_if_possible
 
-    opt = HOMEBREW_PREFIX.join("opt", name)
+    if opt_record.symlink? && path == opt_record.resolved_path
-    if opt.symlink? && path == opt.resolved_path
+      opt_record.unlink
-      opt.unlink
+      opt_record.parent.rmdir_if_possible
-      opt.parent.rmdir_if_possible
     end
   end
 
@@ -306,15 +306,14 @@ class Keg
   end
 
   def optlink
-    from = HOMEBREW_PREFIX.join("opt", name)
+    if opt_record.symlink?
-    if from.symlink?
+      opt_record.delete
-      from.delete
+    elsif opt_record.directory?
-    elsif from.directory?
+      opt_record.rmdir
-      from.rmdir
+    elsif opt_record.exist?
-    elsif from.exist?
+      opt_record.delete
-      from.delete
     end
-    make_relative_symlink(from, path)
+    make_relative_symlink(opt_record, path)
   end
 
   def delete_pyc_files!

Library/Homebrew/keg_fix_install_names.rb

@@ -141,7 +141,7 @@ class Keg
     if shortpath.exist? and not options[:keg_only]
       shortpath.to_s
     else
-      HOMEBREW_PREFIX.join("opt", name, relative_dirname, basename).to_s
+      opt_record.join(relative_dirname, basename).to_s
     end
   end