[patch] Alex's patch

chromium-9999-r1.ebuild.diff (text/plain), 2.32 KB, created by Mike Gilbert on 2010-12-24 02:46:45 UTC

--- gentoo/tree/www-client/chromium/chromium-9999.ebuild	2010-12-21 05:14:04.726000001 +0200
+++ chromium-9999-r1.ebuild	2010-12-22 10:35:33.776000001 +0200
@@ -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"
 
@@ -49,6 +49,7 @@
 	>=dev-util/pkgconfig-0.23
 	sys-devel/flex"
 RDEPEND+="
+	!=www-client/chromium-9999
 	|| (
 		x11-themes/gnome-icon-theme
 		x11-themes/oxygen-molecule
@@ -122,7 +123,8 @@
 }
 
 pkg_setup() {
-	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
+	SUFFIX="-${SLOT}"
+	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${SUFFIX}"
 
 	# Make sure the build system will use the right tools, bug #340795.
 	tc-export AR CC CXX RANLIB
@@ -351,8 +353,8 @@
 	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 chrome${SUFFIX}.1 || die
+	newman out/Release/chrome.1 chromium${SUFFIX}.1 || die
 
 	# Chromium looks for these in its folder
 	# See media_posix.cc and base_paths_linux.cc
@@ -361,9 +363,11 @@
 	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" \
+	newicon out/Release/product_logo_48.png ${PN}${SUFFIX}-browser.png || die
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${SUFFIX} || die
+	sed "s:plugins:plugins --user-data-dir=${HOME}/.config/chromium-live:" \
+		-i "${CHROMIUM_HOME}/chromium-launcher.sh"
+	make_desktop_entry chromium${SUFFIX} "Chromium" ${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
 
@@ -372,5 +376,7 @@
 		dodir /usr/share/gnome-control-center/default-apps || die
 		insinto /usr/share/gnome-control-center/default-apps
 		doins "${FILESDIR}"/chromium.xml || die
+		sed "s:chromium:chromium${SUFFIX}:g" -i \
+			/usr/share/gnome-control-center/default-apps/chromium${SUFFIX}.xml
 	fi
 }