diff --git a/srcpkgs/chromium/files/chromium.desktop b/srcpkgs/chromium/files/chromium.desktop
new file mode 100644
index 0000000000..18446d40f8
--- /dev/null
+++ b/srcpkgs/chromium/files/chromium.desktop
@@ -0,0 +1,113 @@
+[Desktop Entry]
+Version=1.0
+Name=Chromium
+# Only KDE 4 seems to use GenericName, so we reuse the KDE strings.
+# From Ubuntu's language-pack-kde-XX-base packages, version 9.04-20090413.
+GenericName=Web Browser
+GenericName[ar]=متصفح الشبكة
+GenericName[bg]=Уеб браузър
+GenericName[ca]=Navegador web
+GenericName[cs]=WWW prohlížeč
+GenericName[da]=Browser
+GenericName[de]=Web-Browser
+GenericName[el]=Περιηγητής ιστού
+GenericName[en_GB]=Web Browser
+GenericName[es]=Navegador web
+GenericName[et]=Veebibrauser
+GenericName[fi]=WWW-selain
+GenericName[fr]=Navigateur Web
+GenericName[gu]=વેબ બ્રાઉઝર
+GenericName[he]=דפדפן אינטרנט
+GenericName[hi]=वेब ब्राउज़र
+GenericName[hu]=Webböngésző
+GenericName[it]=Browser Web
+GenericName[ja]=ウェブブラウザ
+GenericName[kn]=ಜಾಲ ವೀಕ್ಷಕ
+GenericName[ko]=웹 브라우저
+GenericName[lt]=Žiniatinklio naršyklė
+GenericName[lv]=Tīmekļa pārlūks
+GenericName[ml]=വെബ് ബ്രൌസര്‍
+GenericName[mr]=वेब ब्राऊजर
+GenericName[nb]=Nettleser
+GenericName[nl]=Webbrowser
+GenericName[pl]=Przeglądarka WWW
+GenericName[pt]=Navegador Web
+GenericName[pt_BR]=Navegador da Internet
+GenericName[ro]=Navigator de Internet
+GenericName[ru]=Веб-браузер
+GenericName[sl]=Spletni brskalnik
+GenericName[sv]=Webbläsare
+GenericName[ta]=இணைய உலாவி
+GenericName[th]=เว็บเบราว์เซอร์
+GenericName[tr]=Web Tarayıcı
+GenericName[uk]=Навігатор Тенет
+GenericName[zh_CN]=网页浏览器
+GenericName[zh_HK]=網頁瀏覽器
+GenericName[zh_TW]=網頁瀏覽器
+# Not translated in KDE, from Epiphany 2.26.1-0ubuntu1.
+GenericName[bn]=ওয়েব ব্রাউজার
+GenericName[fil]=Web Browser
+GenericName[hr]=Web preglednik
+GenericName[id]=Browser Web
+GenericName[or]=ଓ୍ବେବ ବ୍ରାଉଜର
+GenericName[sk]=WWW prehliadač
+GenericName[sr]=Интернет прегледник
+GenericName[te]=మహాతల అన్వేషి
+GenericName[vi]=Bộ duyệt Web
+# Gnome and KDE 3 uses Comment.
+Comment=Access the Internet
+Comment[ar]=الدخول إلى الإنترنت
+Comment[bg]=Достъп до интернет
+Comment[bn]=ইন্টারনেটটি অ্যাক্সেস করুন
+Comment[ca]=Accedeix a Internet
+Comment[cs]=Přístup k internetu
+Comment[da]=Få adgang til internettet
+Comment[de]=Internetzugriff
+Comment[el]=Πρόσβαση στο Διαδίκτυο
+Comment[en_GB]=Access the Internet
+Comment[es]=Accede a Internet.
+Comment[et]=Pääs Internetti
+Comment[fi]=Käytä internetiä
+Comment[fil]=I-access ang Internet
+Comment[fr]=Accéder à Internet
+Comment[gu]=ઇંટરનેટ ઍક્સેસ કરો
+Comment[he]=גישה אל האינטרנט
+Comment[hi]=इंटरनेट तक पहुंच स्थापित करें
+Comment[hr]=Pristup Internetu
+Comment[hu]=Internetelérés
+Comment[id]=Akses Internet
+Comment[it]=Accesso a Internet
+Comment[ja]=インターネットにアクセス
+Comment[kn]=ಇಂಟರ್ನೆಟ್ ಅನ್ನು ಪ್ರವೇಶಿಸಿ
+Comment[ko]=인터넷 연결
+Comment[lt]=Interneto prieiga
+Comment[lv]=Piekļūt internetam
+Comment[ml]=ഇന്റര്‍‌നെറ്റ് ആക്‌സസ് ചെയ്യുക
+Comment[mr]=इंटरनेटमध्ये प्रवेश करा
+Comment[nb]=Gå til Internett
+Comment[nl]=Verbinding maken met internet
+Comment[or]=ଇଣ୍ଟର୍ନେଟ୍ ପ୍ରବେଶ କରନ୍ତୁ
+Comment[pl]=Skorzystaj z internetu
+Comment[pt]=Aceder à Internet
+Comment[pt_BR]=Acessar a internet
+Comment[ro]=Accesaţi Internetul
+Comment[ru]=Доступ в Интернет
+Comment[sk]=Prístup do siete Internet
+Comment[sl]=Dostop do interneta
+Comment[sr]=Приступите Интернету
+Comment[sv]=Gå ut på Internet
+Comment[ta]=இணையத்தை அணுகுதல்
+Comment[te]=ఇంటర్నెట్‌ను ఆక్సెస్ చెయ్యండి
+Comment[th]=เข้าถึงอินเทอร์เน็ต
+Comment[tr]=İnternet'e erişin
+Comment[uk]=Доступ до Інтернету
+Comment[vi]=Truy cập Internet
+Comment[zh_CN]=访问互联网
+Comment[zh_HK]=連線到網際網路
+Comment[zh_TW]=連線到網際網路
+Exec=chromium %U
+Terminal=false
+Icon=chromium
+Type=Application
+Categories=GTK;Network;WebBrowser;
+MimeType=text/html;text/xml;application/xhtml+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
diff --git a/srcpkgs/chromium/files/chromium.sh b/srcpkgs/chromium/files/chromium.sh
new file mode 100644
index 0000000000..e1c3388e51
--- /dev/null
+++ b/srcpkgs/chromium/files/chromium.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+export CHROME_WRAPPER=/usr/lib/chromium/chromium
+export CHROME_DESKTOP=chromium.desktop
+exec /usr/lib/chromium/chromium "$@"
diff --git a/srcpkgs/chromium/patches/chromium-cups-r0.patch b/srcpkgs/chromium/patches/chromium-cups-r0.patch
new file mode 100644
index 0000000000..5d0808c049
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-cups-r0.patch
@@ -0,0 +1,41 @@
+--- chrome/browser/ui/webui/print_preview_handler.cc.orig	2011-04-23 09:05:25.000000000 +0200
++++ chrome/browser/ui/webui/print_preview_handler.cc	2011-04-23 09:13:07.000000000 +0200
+@@ -28,7 +28,7 @@
+ #include "printing/metafile_impl.h"
+ #include "printing/print_job_constants.h"
+ 
+-#if defined(OS_POSIX) && !defined(OS_CHROMEOS)
++#if defined(CP_PRINT_SYSTEM_AVAILABLE)
+ #include <cups/cups.h>
+ 
+ #include "base/file_util.h"
+@@ -42,7 +42,7 @@
+ const char kDisableColorOption[] = "disableColorOption";
+ const char kSetColorAsDefault[] = "setColorAsDefault";
+ 
+-#if defined(OS_POSIX) && !defined(OS_CHROMEOS)
++#if defined(CP_PRINT_SYSTEM_AVAILABLE)
+ const char kColorDevice[] = "ColorDevice";
+ #endif
+ 
+@@ -131,7 +131,7 @@
+       return;
+     }
+ 
+-  #if defined(OS_POSIX) && !defined(OS_CHROMEOS)
++#if defined(CP_PRINT_SYSTEM_AVAILABLE)
+     FilePath ppd_file_path;
+     if (!file_util::CreateTemporaryFile(&ppd_file_path))
+       return;
+@@ -153,9 +153,9 @@
+       ppdClose(ppd);
+     }
+     file_util::Delete(ppd_file_path, false);
+-  #elif defined(OS_WIN) || defined(OS_CHROMEOS)
++#else
+     NOTIMPLEMENTED();
+-  #endif
++#endif
+ 
+     DictionaryValue settings_info;
+     settings_info.SetBoolean(kDisableColorOption, !supports_color);
diff --git a/srcpkgs/chromium/patches/gcc-4.6.patch b/srcpkgs/chromium/patches/gcc-4.6.patch
new file mode 100644
index 0000000000..919ccc1599
--- /dev/null
+++ b/srcpkgs/chromium/patches/gcc-4.6.patch
@@ -0,0 +1,160 @@
+diff -u -r chrome/browser/search_engines/template_url_prepopulate_data.h chrome/browser/search_engines/template_url_prepopulate_data.h
+--- chrome/browser/search_engines/template_url_prepopulate_data.h	2011-04-13 13:23:41.000000000 +0400
++++ chrome/browser/search_engines/template_url_prepopulate_data.h	2011-04-20 19:32:58.000000000 +0400
+@@ -7,6 +7,7 @@
+ #pragma once
+ 
+ #include <vector>
++#include <cstddef>
+ 
+ class GURL;
+ class PrefService;
+diff -u -r gpu/command_buffer/common/types.h gpu/command_buffer/common/types.h
+--- gpu/command_buffer/common/types.h	2011-04-13 13:22:57.000000000 +0400
++++ gpu/command_buffer/common/types.h	2011-04-20 19:32:58.000000000 +0400
+@@ -11,6 +11,7 @@
+ #include <stdint.h>
+ #endif
+ #include <string>
++#include <cstddef>
+ 
+ typedef signed char         schar;
+ typedef signed char         int8;
+diff -u -r ppapi/cpp/paint_aggregator.h ppapi/cpp/paint_aggregator.h
+--- ppapi/cpp/paint_aggregator.h	2011-04-13 13:22:58.000000000 +0400
++++ ppapi/cpp/paint_aggregator.h	2011-04-20 20:11:44.000000000 +0400
+@@ -9,6 +9,7 @@
+ 
+ #include "ppapi/cpp/point.h"
+ #include "ppapi/cpp/rect.h"
++#include <cstddef>
+ 
+ namespace pp {
+ 
+diff -u -r third_party/libjingle/source/talk/base/sigslot.h third_party/libjingle/source/talk/base/sigslot.h
+--- third_party/libjingle/source/talk/base/sigslot.h	2011-04-13 13:25:41.000000000 +0400
++++ third_party/libjingle/source/talk/base/sigslot.h	2011-04-20 20:00:43.000000000 +0400
+@@ -80,6 +80,7 @@
+ 
+ #include <set>
+ #include <list>
++#include <cstddef>
+ 
+ // On our copy of sigslot.h, we force single threading
+ #define SIGSLOT_PURE_ISO
+diff -u -r third_party/ots/src/os2.cc third_party/ots/src/os2.cc
+--- third_party/ots/src/os2.cc	2011-04-13 13:24:06.000000000 +0400
++++ third_party/ots/src/os2.cc	2011-04-20 19:45:44.000000000 +0400
+@@ -5,6 +5,7 @@
+ #include "os2.h"
+ 
+ #include "head.h"
++#include <cstddef>
+ 
+ // OS/2 - OS/2 and Windows Metrics
+ // http://www.microsoft.com/opentype/otspec/os2.htm
+diff -u -r third_party/tcmalloc/chromium/src/base/stl_allocator.h third_party/tcmalloc/chromium/src/base/stl_allocator.h
+--- third_party/tcmalloc/chromium/src/base/stl_allocator.h	2011-04-13 13:23:04.000000000 +0400
++++ third_party/tcmalloc/chromium/src/base/stl_allocator.h	2011-04-20 19:32:58.000000000 +0400
+@@ -38,6 +38,7 @@
+ #include <config.h>
+ 
+ #include <limits>
++#include <cstddef>
+ 
+ #include "base/basictypes.h"
+ #include "base/logging.h"
+diff -u -r third_party/tcmalloc/chromium/src/base/vdso_support.h third_party/tcmalloc/chromium/src/base/vdso_support.h
+--- third_party/tcmalloc/chromium/src/base/vdso_support.h	2011-04-13 13:23:04.000000000 +0400
++++ third_party/tcmalloc/chromium/src/base/vdso_support.h	2011-04-20 19:32:58.000000000 +0400
+@@ -37,6 +37,7 @@
+ 
+ #define HAVE_VDSO_SUPPORT 1
+ 
++#include <cstddef>
+ #include <stdlib.h>     // for NULL
+ #include <link.h>  // for ElfW
+ #include "base/basictypes.h"
+diff -u -r third_party/tcmalloc/chromium/src/common.cc third_party/tcmalloc/chromium/src/common.cc
+--- third_party/tcmalloc/chromium/src/common.cc	2011-04-13 13:23:04.000000000 +0400
++++ third_party/tcmalloc/chromium/src/common.cc	2011-04-20 19:32:58.000000000 +0400
+@@ -34,6 +34,7 @@
+ #include "system-alloc.h"
+ #include "config.h"
+ #include "common.h"
++#include <cstddef>
+ 
+ namespace tcmalloc {
+ 
+diff -u -r third_party/tcmalloc/chromium/src/symbolize.h third_party/tcmalloc/chromium/src/symbolize.h
+--- third_party/tcmalloc/chromium/src/symbolize.h	2011-04-13 13:23:04.000000000 +0400
++++ third_party/tcmalloc/chromium/src/symbolize.h	2011-04-20 19:32:58.000000000 +0400
+@@ -38,6 +38,7 @@
+ #include <stdint.h>  // for uintptr_t
+ #endif
+ #include <map>
++#include <cstddef>
+ 
+ using std::map;
+ 
+diff -u -r third_party/tcmalloc/chromium/src/system-alloc.h third_party/tcmalloc/chromium/src/system-alloc.h
+--- third_party/tcmalloc/chromium/src/system-alloc.h	2011-04-13 13:23:04.000000000 +0400
++++ third_party/tcmalloc/chromium/src/system-alloc.h	2011-04-20 19:32:58.000000000 +0400
+@@ -37,6 +37,7 @@
+ #define TCMALLOC_SYSTEM_ALLOC_H_
+ 
+ #include <config.h>
++#include <cstddef>
+ #include "internal_logging.h"
+ 
+ // REQUIRES: "alignment" is a power of two or "0" to indicate default alignment
+diff -u -r ui/gfx/codec/jpeg_codec.h ui/gfx/codec/jpeg_codec.h
+--- ui/gfx/codec/jpeg_codec.h	2011-04-13 13:23:45.000000000 +0400
++++ ui/gfx/codec/jpeg_codec.h	2011-04-20 19:32:58.000000000 +0400
+@@ -7,6 +7,7 @@
+ #pragma once
+ 
+ #include <vector>
++#include <cstddef>
+ 
+ class SkBitmap;
+ 
+--- ppapi/cpp/paint_aggregator.h	2010-12-23 18:10:27.000000000 -0600
++++ ppapi/cpp/paint_aggregator.h~	2011-04-19 05:34:56.085582885 -0500
+@@ -5,6 +5,7 @@
+ #ifndef PPAPI_CPP_PAINT_AGGREGATOR_H_
+ #define PPAPI_CPP_PAINT_AGGREGATOR_H_
+ 
++#include <cstddef>
+ #include <vector>
+ 
+ #include "ppapi/cpp/point.h"
+Index: Source/WebCore/ChangeLog
+===================================================================
+--- third_party/WebKit/Source/WebCore/ChangeLog	(revision 84120)
++++ third_party/WebKit/Source/WebCore/ChangeLog	(revision 84123)
+@@ -1,2 +1,24 @@
++2011-04-17  Thierry Reding  <thierry.reding@avionic-design.de>
++
++        Reviewed by Adam Barth.
++
++        Fix build with GCC 4.6.
++
++        * dom/make_names.pl: Execute preprocessor without the -P option. The
++        preprocessor in GCC 4.6 eats empty lines, effectively breaking the
++        parsing performed by this script. Dropping the -P option when invoking
++        the preprocessor keeps the empty lines but as a side-effect also adds
++        additional linemarkers.
++
++        From the cpp manpage:
++
++          -P  Inhibit generation of linemarkers in the output from the
++              preprocessor. This might be useful when running the preprocessor
++              on something that is not C code, and will be sent to a program
++              which might be confused by the linemarkers.
++
++        The linemarkers are not problematic, however, because the script
++        properly handles them by ignoring all lines starting with a #.
++
+ 2011-04-17  David Kilzer  <ddkilzer@apple.com>
+ 
diff --git a/srcpkgs/chromium/patches/perl_deprecated_switch_module_use_givenwhen.patch b/srcpkgs/chromium/patches/perl_deprecated_switch_module_use_givenwhen.patch
new file mode 100644
index 0000000000..0a5f0c0e8d
--- /dev/null
+++ b/srcpkgs/chromium/patches/perl_deprecated_switch_module_use_givenwhen.patch
@@ -0,0 +1,132 @@
+perl-5.14 deprecated the Switch module. We can use the given/when statement instead,
+available since 5.10.
+
+--- third_party/WebKit/Source/WebKit/scripts/generate-webkitversion.pl.orig	2011-06-18 11:13:44.104816166 +0200
++++ third_party/WebKit/Source/WebKit/scripts/generate-webkitversion.pl	2011-06-18 11:14:10.238814221 +0200
+@@ -39,7 +39,6 @@ use strict;
+ use Config;
+ use Getopt::Long;
+ use File::Path;
+-use Switch;
+ 
+ my $usage = "generate-webkitversion --config WebKit/mac/Configurations/Version.xcconfig --outputDir <outputdir>";
+ 
+--- chrome/tools/test/generate_mime_tests.pl.orig	2011-06-14 10:01:52.000000000 +0200
++++ chrome/tools/test/generate_mime_tests.pl	2011-06-18 11:48:40.093660143 +0200
+@@ -32,7 +32,7 @@
+ # the layout test framework.
+ 
+ use strict;
+-use Switch;  # used for switch-case program structure
++use feature qw(switch);
+ 
+ my $arg_count = $#ARGV + 1;
+ 
+@@ -161,15 +161,15 @@ my @expected = (
+ #   Output : returns the associated description
+ sub get_result_description
+ {
+-  switch ($_[0]) {
+-    case "void"  { return "NOTHING";}
+-    case "image" { return "an IMAGE";}
+-    case "text"  { return "simple TEXT";}
+-    case "html"  { return "an HTML as text";}
+-    case "flash" { return "a FLASH object"}
+-    case "rs"    { return "been RENDERED CORRECTLY";}
+-    case "rf"    { return "been RENDERED INCORRECTLY";}
+-    else         { return "UNKNOWN";}
++  given ($_[0]) {
++    when ('void')  { return "NOTHING";}
++    when ('image') { return "an IMAGE";}
++    when ('text')  { return "simple TEXT";}
++    when ('html')  { return "an HTML as text";}
++    when ('flash') { return "a FLASH object"}
++    when ('rs')    { return "been RENDERED CORRECTLY";}
++    when ('rf')    { return "been RENDERED INCORRECTLY";}
++    default         { return "UNKNOWN";}
+   }
+ }
+ 
+@@ -180,22 +180,22 @@ sub get_result_description
+ #   Output : returns the associated description
+ sub get_query_description
+ {
+-  switch ($_[0]) {     
+-    case "tag=img&content=type_gif.gif" { return "HTML page with a GIF image";}
+-    case "tag=img&content=type_bmp.bmp" { return "HTML page with a BMP image";}
+-    case "tag=img&content=type_tif.tif" { return "HTML page with a TIF image";}
+-    case "tag=img&content=type_png.png" { return "HTML page with a PNG image";}
+-    case "tag=img&content=type_jpg.jpg" { return "HTML page with a JPEG image"}
+-    case "tag=img&content=type_txt.txt" { return "HTML page";}
+-    case "tag=embed&content=type_swf.swf" { return "an HTML page with a FLASH object";}
+-    case "switch=nohtml&content=type_gif.gif" { return "GIF image and no HTML";}
+-    case "switch=nohtml&content=type_bmp.bmp" { return "BMP image and no HTML";}
+-    case "switch=nohtml&content=type_tif.tif" { return "TIF image and no HTML";}
+-    case "switch=nohtml&content=type_png.png" { return "PNG image and no HTML";}
+-    case "switch=nohtml&content=type_jpg.jpg" { return "JPEG image and no HTML"}
+-    case "switch=nohtml&content=type_txt.txt" { return "simple TEXT and no HTML";}
+-    case "switch=nohtml&content=type_swf.swf" { return "FLASH object and no HTML";}
+-    else { return "UNKNOWN TYPE";}
++  given ($_[0]) {     
++    when ('tag=img&content=type_gif.gif') { return "HTML page with a GIF image";}
++    when ('tag=img&content=type_bmp.bmp') { return "HTML page with a BMP image";}
++    when ('tag=img&content=type_tif.tif') { return "HTML page with a TIF image";}
++    when ('tag=img&content=type_png.png') { return "HTML page with a PNG image";}
++    when ('tag=img&content=type_jpg.jpg') { return "HTML page with a JPEG image"}
++    when ('tag=img&content=type_txt.txt') { return "HTML page";}
++    when ('tag=embed&content=type_swf.swf') { return "an HTML page with a FLASH object";}
++    when ('switch=nohtml&content=type_gif.gif') { return "GIF image and no HTML";}
++    when ('switch=nohtml&content=type_bmp.bmp') { return "BMP image and no HTML";}
++    when ('switch=nohtml&content=type_tif.tif') { return "TIF image and no HTML";}
++    when ('switch=nohtml&content=type_png.png') { return "PNG image and no HTML";}
++    when ('switch=nohtml&content=type_jpg.jpg') { return "JPEG image and no HTML"}
++    when ('switch=nohtml&content=type_txt.txt') { return "simple TEXT and no HTML";}
++    when ('switch=nohtml&content=type_swf.swf') { return "FLASH object and no HTML";}
++    default { return "UNKNOWN TYPE";}
+   }
+ }
+ 
+--- third_party/WebKit/Source/WebCore/make-hash-tools.pl.orig	2011-06-14 10:04:55.000000000 +0200
++++ third_party/WebKit/Source/WebCore/make-hash-tools.pl	2011-06-18 11:49:02.502658474 +0200
+@@ -20,7 +20,7 @@
+ #   Boston, MA 02110-1301, USA.
+ 
+ use strict;
+-use Switch;
++use feature qw(switch);
+ use File::Basename;
+ 
+ my $outdir = $ARGV[0];
+@@ -28,9 +28,9 @@ shift;
+ my $option = basename($ARGV[0],".gperf");
+ 
+ 
+-switch ($option) {
++given ($option) {
+ 
+-case "DocTypeStrings" {
++when ('DocTypeStrings') {
+ 
+     my $docTypeStringsGenerated    = "$outdir/DocTypeStrings.cpp";
+     my $docTypeStringsGperf        = $ARGV[0];
+@@ -38,9 +38,9 @@ case "DocTypeStrings" {
+ 
+     system("gperf --key-positions=\"*\" -s 2 $docTypeStringsGperf > $docTypeStringsGenerated") == 0 || die "calling gperf failed: $?";
+ 
+-} # case "DocTypeStrings"
++} # when "DocTypeStrings"
+ 
+-case "ColorData" {
++when ('ColorData') {
+ 
+     my $colorDataGenerated         = "$outdir/ColorData.cpp";
+     my $colorDataGperf             = $ARGV[0];
+@@ -48,6 +48,6 @@ case "ColorData" {
+ 
+     system("gperf --key-positions=\"*\" -D -s 2 $colorDataGperf > $colorDataGenerated") == 0 || die "calling gperf failed: $?";
+ 
+-} # case "ColorData"
++} # when "ColorData"
+ 
+-} # switch ($option)
++} # given ($option)
diff --git a/srcpkgs/chromium/patches/tcmalloc-prototypes-glibc-2.14.patch b/srcpkgs/chromium/patches/tcmalloc-prototypes-glibc-2.14.patch
new file mode 100644
index 0000000000..5e013b34f6
--- /dev/null
+++ b/srcpkgs/chromium/patches/tcmalloc-prototypes-glibc-2.14.patch
@@ -0,0 +1,39 @@
+glibc-2.14 changed the _hook prototypes with a volatile pointer.
+
+--- third_party/tcmalloc/chromium/src/tcmalloc.cc.orig	2011-06-18 10:29:01.407015864 +0200
++++ third_party/tcmalloc/chromium/src/tcmalloc.cc	2011-06-18 10:29:32.305013564 +0200
+@@ -375,7 +375,7 @@ static void* tc_ptmalloc_malloc_hook(siz
+   return tc_malloc(size);
+ }
+ 
+-void* (*__malloc_hook)(
++void* (* volatile __malloc_hook)(
+     size_t size, const void* caller) = tc_ptmalloc_malloc_hook;
+ 
+ static void* tc_ptmalloc_realloc_hook(
+@@ -383,14 +383,14 @@ static void* tc_ptmalloc_realloc_hook(
+   return tc_realloc(ptr, size);
+ }
+ 
+-void* (*__realloc_hook)(
++void* (* volatile __realloc_hook)(
+     void* ptr, size_t size, const void* caller) = tc_ptmalloc_realloc_hook;
+ 
+ static void tc_ptmalloc_free_hook(void* ptr, const void* caller) {
+   tc_free(ptr);
+ }
+ 
+-void (*__free_hook)(void* ptr, const void* caller) = tc_ptmalloc_free_hook;
++void (* volatile __free_hook)(void* ptr, const void* caller) = tc_ptmalloc_free_hook;
+ 
+ #endif
+ 
+@@ -1584,7 +1584,7 @@ static void *MemalignOverride(size_t ali
+   MallocHook::InvokeNewHook(result, size);
+   return result;
+ }
+-void *(*__memalign_hook)(size_t, size_t, const void *) = MemalignOverride;
++void *(* volatile __memalign_hook)(size_t, size_t, const void *) = MemalignOverride;
+ #endif  // #ifndef TCMALLOC_FOR_DEBUGALLOCATION
+ 
+ // ---Double free() debugging implementation -----------------------------------
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
new file mode 100644
index 0000000000..d1864b9061
--- /dev/null
+++ b/srcpkgs/chromium/template
@@ -0,0 +1,150 @@
+# Template file for 'chromium'
+pkgname=chromium
+version=12.0.742.100
+distfiles="http://build.chromium.org/official/$pkgname-$version.tar.bz2"
+build_style=custom-install
+short_desc="Google's attempt at creating a safer, faster, and more stable browser"
+maintainer="Juan RP <xtraeme@gmail.com>"
+homepage="http://www.chromium.org/"
+license="BSD"
+checksum=58f51ace0ad420357491953ad9a4b3421e830cf9dcdebfe8da3ed672eea2a6ed
+long_desc="
+ Chromium is an open-source browser project that aims to build a safer,
+ faster, and more stable way for all Internet users to experience the web.
+
+ Chromium serves as a base for Google Chrome, which is Chromium rebranded
+ (name and logo) with very few additions such as usage tracking and an
+ auto-updater system.
+
+ This package contains the Chromium browser."
+
+gtk_iconcache_dirs="/usr/share/icons/hicolor"
+nostrip=yes
+
+Add_dependency run libX11
+Add_dependency run glibc
+Add_dependency run libXrender
+Add_dependency run libXScrnSaver
+Add_dependency run libXext
+Add_dependency run gtk+
+Add_dependency run pango
+Add_dependency run gdk-pixbuf
+Add_dependency run libpng
+Add_dependency run cairo
+Add_dependency run freetype
+Add_dependency run fontconfig
+Add_dependency run glib
+Add_dependency run libevent
+Add_dependency run icu-libs
+Add_dependency run zlib
+Add_dependency run jpeg
+Add_dependency run nss
+Add_dependency run nspr
+Add_dependency run libxml2
+Add_dependency run libxslt
+Add_dependency run bzip2
+Add_dependency run alsa-lib
+Add_dependency run expat
+Add_dependency run libflac
+Add_dependency run dbus-glib
+Add_dependency run dbus-libs
+Add_dependency run libXdamage
+Add_dependency run libXtst
+Add_dependency run pam
+Add_dependency run libstdc++
+Add_dependency run libgcc
+
+Add_dependency build pkg-config
+Add_dependency build yasm
+Add_dependency build python
+Add_dependency build libX11-devel
+Add_dependency build glibc-devel
+Add_dependency build libXrender-devel
+Add_dependency build libXScrnSaver-devel
+Add_dependency build libXext-devel
+Add_dependency build gtk+-devel
+Add_dependency build pango-devel
+Add_dependency build gdk-pixbuf-devel
+Add_dependency build libpng-devel
+Add_dependency build cairo-devel
+Add_dependency build freetype-devel
+Add_dependency build fontconfig-devel
+Add_dependency build glib-devel
+Add_dependency build libevent-devel
+Add_dependency build icu-devel
+Add_dependency build zlib-devel
+Add_dependency build jpeg-devel
+Add_dependency build nss-devel
+Add_dependency build nspr-devel
+Add_dependency build libxml2-devel
+Add_dependency build libxslt-devel
+Add_dependency build bzip2-devel
+Add_dependency build alsa-lib-devel
+Add_dependency build expat-devel
+Add_dependency build libflac-devel
+Add_dependency build dbus-glib-devel
+Add_dependency build dbus-devel
+Add_dependency build libXdamage-devel
+Add_dependency build libXtst-devel
+Add_dependency build pam-devel
+
+Add_dependency full desktop-file-utils
+Add_dependency full hicolor-icon-theme
+
+do_build()
+{
+	# We need to disable system_ssl until "next protocol negotiation" support is
+	# available in our nss package.
+	# (See https://bugzilla.mozilla.org/show_bug.cgi?id=547312)
+	#
+	# XXX: Disable CUPS until a package exists.
+	build/gyp_chromium -f make build/all.gyp --depth=. \
+		-Dgcc_version=45 \
+		-Dno_strict_aliasing=1 \
+		-Dwerror= \
+		-Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \
+		-Dlinux_strip_binary=1 \
+		-Drelease_extra_cflags="$CFLAGS" \
+		-Dffmpeg_branding=Chrome \
+		-Dproprietary_codecs=1 \
+		-Duse_system_libjpeg=1 \
+		-Duse_system_libxslt=1 \
+		-Duse_system_libxml=1 \
+		-Duse_system_bzip2=1 \
+		-Duse_system_zlib=1 \
+		-Duse_system_libpng=1 \
+		-Duse_system_ffmpeg=0 \
+		-Duse_system_yasm=1 \
+		-Duse_system_libevent=1 \
+		-Duse_system_ssl=0 \
+		-Duse_system_flac=1 \
+		-Duse_system_icu=1 \
+		-Duse_system_xdg_utils=1 \
+		-Duse_gconf=0 \
+		-Duse_cups=0
+
+	make ${makejobs} chrome chrome_sandbox BUILDTYPE=Release
+}
+
+do_install()
+{
+	install -D out/Release/chrome ${DESTDIR}/usr/lib/chromium/chromium
+	install -Dm4755 out/Release/chrome_sandbox \
+		${DESTDIR}/usr/lib/chromium/chromium-sandbox
+	install -Dm644 out/Release/chrome.pak ${DESTDIR}/usr/lib/chromium/chrome.pak
+	install -Dm644 out/Release/resources.pak \
+		${DESTDIR}/usr/lib/chromium/resources.pak
+	install -D out/Release/libffmpegsumo.so \
+		${DESTDIR}/usr/lib/chromium/libffmpegsumo.so
+	cp -a out/Release/locales out/Release/resources ${DESTDIR}/usr/lib/chromium/
+	find ${DESTDIR}/usr/lib/chromium/ -name '*.d' -type f -delete
+	install -Dm644 out/Release/chrome.1 ${DESTDIR}/usr/share/man/man1/chromium.1
+	install -Dm644 ${FILESDIR}/chromium.desktop \
+		${DESTDIR}/usr/share/applications/chromium.desktop
+	for size in 16 22 24 32 48 64 128 256; do
+		install -Dm644 "chrome/app/theme/chromium/product_logo_$size.png" \
+		${DESTDIR}/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png
+	done
+	install -D ${FILESDIR}/chromium.sh ${DESTDIR}/usr/bin/chromium
+	install -Dm644 LICENSE ${DESTDIR}/usr/share/licenses/chromium/LICENSE
+}