[patch] floppym's new patch

chromium-multislot-floppym-r1.patch (text/plain), 3.41 KB, created by Mike Gilbert on 2010-12-24 02:50:02 UTC

diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
--- a/www-client/chromium/chromium-9999.ebuild
+++ b/www-client/chromium/chromium-9999.ebuild
@@ -15,7 +15,7 @@
 EGCLIENT_REPO_URI="http://src.chromium.org/svn/trunk/src/"
 
 LICENSE="BSD"
-SLOT="0"
+SLOT="live"
 KEYWORDS=""
 IUSE="cups +gecko-mediaplayer gnome gnome-keyring system-sqlite system-v8"
 
@@ -123,7 +123,8 @@
 }
 
 pkg_setup() {
-	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
+	SUFFIX="-${SLOT}"
+	CHROMIUM_HOME="/usr/$(get_libdir)/chromium${SUFFIX}-browser"
 
 	# Make sure the build system will use the right tools, bug #340795.
 	tc-export AR CC CXX RANLIB
@@ -344,6 +345,8 @@
 	fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
 	doexe out/Release/xdg-settings || die
 	doexe "${FILESDIR}"/chromium-launcher.sh || die
+	sed "s/SUFFIX=/SUFFIX=${SUFFIX}/" -i \
+		"${D}/${CHROMIUM_HOME}"/chromium-launcher.sh || die
 
 	insinto "${CHROMIUM_HOME}"
 	doins out/Release/chrome.pak || die
@@ -353,8 +356,7 @@
 	doins -r out/Release/resources || die
 
 	# chrome.1 is for chromium --help
-	newman out/Release/chrome.1 chrome.1 || die
-	newman out/Release/chrome.1 chromium.1 || die
+	newman out/Release/chrome.1 ${PN}${SUFFIX}.1 || die
 
 	# Chromium looks for these in its folder
 	# See media_posix.cc and base_paths_linux.cc
@@ -363,16 +365,19 @@
 	dosym /usr/$(get_libdir)/libavutil.so.50 "${CHROMIUM_HOME}" || die
 
 	# Install icon and desktop entry.
-	newicon out/Release/product_logo_48.png ${PN}-browser.png || die
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium || die
-	make_desktop_entry chromium "Chromium" ${PN}-browser "Network;WebBrowser" \
-		"MimeType=text/html;text/xml;application/xhtml+xml;"
+	newicon out/Release/product_logo_48.png ${PN}${SUFFIX}-browser.png || die
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/${PN}${SUFFIX} || die
+	make_desktop_entry ${PN}${SUFFIX} "Chromium ${SLOT}" ${PN}${SUFFIX}-browser \
+		"Network;WebBrowser" "MimeType=text/html;text/xml;application/xhtml+xml;"
 	sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop || die
 
 	# Install GNOME default application entry (bug #303100).
 	if use gnome; then
 		dodir /usr/share/gnome-control-center/default-apps || die
 		insinto /usr/share/gnome-control-center/default-apps
-		doins "${FILESDIR}"/chromium.xml || die
+		newins "${FILESDIR}"/chromium.xml chromium${SUFFIX}.xml || die
+		sed "s:chromium:chromium${SUFFIX}:g" -i \
+			"${D}"/usr/share/gnome-control-center/default-apps/chromium${SUFFIX}.xml \
+			|| die
 	fi
 }
diff --git a/www-client/chromium/files/chromium-launcher.sh b/www-client/chromium/files/chromium-launcher.sh
--- a/www-client/chromium/files/chromium-launcher.sh
+++ b/www-client/chromium/files/chromium-launcher.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
@@ -19,7 +19,11 @@
     ;;
 esac
 
+SUFFIX=
+XDG_CONFIG_HOME=${XDG_CONFIG_HOME:-~/.config}
+[[ -n "$SUFFIX" ]] && USER_DATA_DIR=--user-data-dir=$XDG_CONFIG_HOME/chromium$SUFFIX
+
 # Set the .desktop file name
-export CHROME_DESKTOP="chromium-chromium.desktop"
+export CHROME_DESKTOP="chromium$SUFFIX-chromium$SUFFIX.desktop"
 
-exec "$PROGDIR/chrome" --extra-plugin-dir=/usr/lib/nsbrowser/plugins "$@"
+exec -a "chromium$SUFFIX" "$PROGDIR/chrome" --extra-plugin-dir=/usr/lib/nsbrowser/plugins "$USER_DATA_DIR" "$@"