--- Gemfile.orig	2014-01-17 17:27:47.960000000 +0100
+++ Gemfile	2014-01-17 17:28:20.620000000 +0100
@@ -134,13 +134,16 @@
 # Sanitize user input
 gem "sanitize"
 
+# The newer revision of charlock_holmes that is finally fixed to
+# be compatible with Gentoo
+gem "charlock_holmes", git: "https://github.com/brianmario/charlock_holmes.git", ref: "dde194609b3513b0d2369ce8f916ae52566154b4"
+
 # Protect against bruteforcing
 gem "rack-attack"
 
 gem "sass-rails"
 gem "coffee-rails"
 gem "uglifier"
-gem "therubyracer"
 gem 'turbolinks'
 gem 'jquery-turbolinks'
 
--- Gemfile.lock.orig	2014-01-17 17:29:53.490000000 +0100
+++ Gemfile.lock	2014-01-17 17:33:01.660000000 +0100
@@ -1,4 +1,11 @@
 GIT
+  remote: https://github.com/brianmario/charlock_holmes.git
+  revision: dde194609b3513b0d2369ce8f916ae52566154b4
+  ref: dde194609b3513b0d2369ce8f916ae52566154b4
+  specs:
+    charlock_holmes (0.6.9.4)
+
+GIT
   remote: https://github.com/gitlabhq/gon.git
   revision: 58ca8e17273051cb370182cabd3602d1da6783ab
   ref: 58ca8e17273051cb370182cabd3602d1da6783ab
@@ -72,7 +79,6 @@
       json (>= 1.7)
     celluloid (0.15.2)
       timers (~> 1.1.0)
-    charlock_holmes (0.6.9.4)
     chosen-rails (1.0.1)
       coffee-rails (>= 3.2)
       compass-rails (>= 1.0)
@@ -278,7 +284,6 @@
       addressable (~> 2.3)
     letter_opener (1.1.2)
       launchy (~> 2.2)
-    libv8 (3.16.14.3)
     listen (2.3.1)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
@@ -412,7 +417,6 @@
       redis-store (~> 1.1.0)
     redis-store (1.1.4)
       redis (>= 2.2)
-    ref (1.0.5)
     require_all (1.3.2)
     rest-client (1.6.7)
       mime-types (>= 1.16)
@@ -499,9 +503,6 @@
     term-ansicolor (1.2.2)
       tins (~> 0.8)
     test_after_commit (0.2.2)
-    therubyracer (0.12.0)
-      libv8 (~> 3.16.14.0)
-      ref
     thin (1.6.1)
       daemons (>= 1.0.9)
       eventmachine (>= 1.0.0)
@@ -572,6 +573,7 @@
   bootstrap-sass (~> 2.3)
   capybara
   carrierwave
+  charlock_holmes!
   chosen-rails (= 1.0.1)
   coffee-rails
   colored
@@ -655,7 +657,6 @@
   stamp
   state_machine
   test_after_commit
-  therubyracer
   thin
   tinder (~> 1.9.2)
   turbolinks