From 3a4a529453c49572be1e0738cb4e9fd8efa75581 Mon Sep 17 00:00:00 2001
From: Adam Vandenberg <flangy@gmail.com>
Date: Sun, 23 Feb 2014 17:39:01 -0800
Subject: [PATCH] remove charset.alias directly

---
 Library/Homebrew/cleaner.rb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Library/Homebrew/cleaner.rb b/Library/Homebrew/cleaner.rb
index d22e70cc12..3fa3bb6f6b 100644
--- a/Library/Homebrew/cleaner.rb
+++ b/Library/Homebrew/cleaner.rb
@@ -13,6 +13,12 @@ class Cleaner
   # Clean the keg of formula @f
   def clean
     ObserverPathnameExtension.reset_counts!
+
+    # Many formulae include 'lib/charset.alias', but it is not strictly needed
+    # and will conflict if more than one formula provides it
+    alias_path = @f.lib/'charset.alias'
+    alias_path.extend(ObserverPathnameExtension).unlink if alias_path.exist?
+
     [@f.bin, @f.sbin, @f.lib].select{ |d| d.exist? }.each{ |d| clean_dir d }
 
     # Get rid of any info 'dir' files, so they don't conflict at the link stage
@@ -30,7 +36,6 @@ class Cleaner
   def prune
     dirs = []
     symlinks = []
-
     @f.prefix.find do |path|
       if @f.skip_clean? path
         Find.prune
@@ -80,9 +85,6 @@ class Cleaner
         next
       elsif path.extname == '.la'
         path.unlink
-      elsif path == @f.lib+'charset.alias'
-        # Many formulae symlink this file, but it is not strictly needed
-        path.unlink
       else
         clean_file_permissions(path)
       end