From 5efcae6e85f48f62e3f3a809963a3006319fa093 Mon Sep 17 00:00:00 2001
From: Heiko Przybyl <zuxez@cs.tu-berlin.de>
Date: Fri, 18 Sep 2009 20:41:40 +0200
Subject: [PATCH] net-www/chromium: Centralize wrapper. UNTESTED!!!

---
 packages/net-www/chromium/chromium-25500.exheres-0 | 7 +------
 packages/net-www/chromium/chromium-99999.exheres-0 | 7 +------
 packages/net-www/chromium/chromium-scm.exheres-0   | 7 +------
 packages/net-www/chromium/chromium.exlib           | 9 +++++++++
 4 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/packages/net-www/chromium/chromium-25500.exheres-0 b/packages/net-www/chromium/chromium-25500.exheres-0
index add341c..32c01de 100644
--- a/packages/net-www/chromium/chromium-25500.exheres-0
+++ b/packages/net-www/chromium/chromium-25500.exheres-0
@@ -46,10 +46,5 @@ src_install() {
         dosym ${to} ${dest}/${l}
     done
 
-    # add a wrapper to the binary
-    herebin chromium-${PV} <<EOF
-#!/usr/bin/env bash
-
-LD_LIBRARY_PATH=${dest} ${dest}/chrome "\$@"
-EOF
+    chromium_do_wrapper "${dest}"
 }
diff --git a/packages/net-www/chromium/chromium-99999.exheres-0 b/packages/net-www/chromium/chromium-99999.exheres-0
index fb3fcb3..6079041 100644
--- a/packages/net-www/chromium/chromium-99999.exheres-0
+++ b/packages/net-www/chromium/chromium-99999.exheres-0
@@ -74,10 +74,5 @@ src_install() {
         dosym ${to} ${dest}/${l}
     done
 
-    # add a wrapper to the binary
-    herebin chromium-${PV} <<EOF
-#!/usr/bin/env bash
-
-LD_LIBRARY_PATH=${dest} ${dest}/chrome "\$@"
-EOF
+    chromium_do_wrapper "${dest}"
 }
diff --git a/packages/net-www/chromium/chromium-scm.exheres-0 b/packages/net-www/chromium/chromium-scm.exheres-0
index 7ff89b9..2f4f8c6 100644
--- a/packages/net-www/chromium/chromium-scm.exheres-0
+++ b/packages/net-www/chromium/chromium-scm.exheres-0
@@ -161,11 +161,6 @@ src_install() {
     # Man page
     doman chromium-browser.1
 
-    # Add a wrapper to the binary
-    herebin chromium-${PV} <<EOF
-#!/usr/bin/env bash
-
-LD_LIBRARY_PATH=${dest} ${dest}/chrome "\$@"
-EOF
+    chromium_do_wrapper "${dest}"
 }
 
diff --git a/packages/net-www/chromium/chromium.exlib b/packages/net-www/chromium/chromium.exlib
index 332fc9e..06640fb 100644
--- a/packages/net-www/chromium/chromium.exlib
+++ b/packages/net-www/chromium/chromium.exlib
@@ -78,3 +78,12 @@ pkg_postinst() {
         einfo "http://code.google.com/p/chromium/issues/detail?id=20882"
     fi
 }
+
+chromium_do_wrapper() {
+    # Add a wrapper to the binary
+    herebin ${PN}-${PV} <<EOF
+#!/usr/bin/env bash
+
+LD_LIBRARY_PATH="${1}:${LD_LIBRARY_PATH}" "${1}"/chrome "\$@"
+EOF
+}
-- 
2.11.4.GIT