Attachment #257907 for bug #349555

Lines 15-21 Link Here

(-)a/www-client/chromium/chromium-9999.ebuild (-9 / +14 lines)
15	EGCLIENT_REPO_URI="http://src.chromium.org/svn/trunk/src/"	15	EGCLIENT_REPO_URI="http://src.chromium.org/svn/trunk/src/"
16		16
17	LICENSE="BSD"	17	LICENSE="BSD"
18	SLOT="0"	18	SLOT="live"
19	KEYWORDS=""	19	KEYWORDS=""
20	IUSE="cups +gecko-mediaplayer gnome gnome-keyring system-sqlite system-v8"	20	IUSE="cups +gecko-mediaplayer gnome gnome-keyring system-sqlite system-v8"
21		21
Lines 123-129 Link Here
123	}	123	}
124		124
125	pkg_setup() {	125	pkg_setup() {
126	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"	126	SUFFIX="-${SLOT}"
		127	CHROMIUM_HOME="/usr/$(get_libdir)/chromium${SUFFIX}-browser"
127		128
128	# Make sure the build system will use the right tools, bug #340795.	129	# Make sure the build system will use the right tools, bug #340795.
129	tc-export AR CC CXX RANLIB	130	tc-export AR CC CXX RANLIB
Lines 344-349 Link Here
344	fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"	345	fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
345	doexe out/Release/xdg-settings \|\| die	346	doexe out/Release/xdg-settings \|\| die
346	doexe "${FILESDIR}"/chromium-launcher.sh \|\| die	347	doexe "${FILESDIR}"/chromium-launcher.sh \|\| die
		348	sed "s/SUFFIX=/SUFFIX=${SUFFIX}/" -i \
		349	"${D}/${CHROMIUM_HOME}"/chromium-launcher.sh \|\| die
347		350
348	insinto "${CHROMIUM_HOME}"	351	insinto "${CHROMIUM_HOME}"
349	doins out/Release/chrome.pak \|\| die	352	doins out/Release/chrome.pak \|\| die
Lines 353-360 Link Here
353	doins -r out/Release/resources \|\| die	356	doins -r out/Release/resources \|\| die
354		357
355	# chrome.1 is for chromium --help	358	# chrome.1 is for chromium --help
356	newman out/Release/chrome.1 chrome.1 \|\| die	359	newman out/Release/chrome.1 ${PN}${SUFFIX}.1 \|\| die
357	newman out/Release/chrome.1 chromium.1 \|\| die
358		360
359	# Chromium looks for these in its folder	361	# Chromium looks for these in its folder
360	# See media_posix.cc and base_paths_linux.cc	362	# See media_posix.cc and base_paths_linux.cc
Lines 363-378 Link Here
363	dosym /usr/$(get_libdir)/libavutil.so.50 "${CHROMIUM_HOME}" \|\| die	365	dosym /usr/$(get_libdir)/libavutil.so.50 "${CHROMIUM_HOME}" \|\| die
364		366
365	# Install icon and desktop entry.	367	# Install icon and desktop entry.
366	newicon out/Release/product_logo_48.png ${PN}-browser.png \|\| die	368	newicon out/Release/product_logo_48.png ${PN}${SUFFIX}-browser.png \|\| die
367	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium \|\| die	369	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/${PN}${SUFFIX} \|\| die
368	make_desktop_entry chromium "Chromium" ${PN}-browser "Network;WebBrowser" \	370	make_desktop_entry ${PN}${SUFFIX} "Chromium ${SLOT}" ${PN}${SUFFIX}-browser \
369	"MimeType=text/html;text/xml;application/xhtml+xml;"	371	"Network;WebBrowser" "MimeType=text/html;text/xml;application/xhtml+xml;"
370	sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop \|\| die	372	sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop \|\| die
371		373
372	# Install GNOME default application entry (bug #303100).	374	# Install GNOME default application entry (bug #303100).
373	if use gnome; then	375	if use gnome; then
374	dodir /usr/share/gnome-control-center/default-apps \|\| die	376	dodir /usr/share/gnome-control-center/default-apps \|\| die
375	insinto /usr/share/gnome-control-center/default-apps	377	insinto /usr/share/gnome-control-center/default-apps
376	doins "${FILESDIR}"/chromium.xml \|\| die	378	newins "${FILESDIR}"/chromium.xml chromium${SUFFIX}.xml \|\| die
		379	sed "s:chromium:chromium${SUFFIX}:g" -i \
		380	"${D}"/usr/share/gnome-control-center/default-apps/chromium${SUFFIX}.xml \
		381	\|\| die
377	fi	382	fi
378	}	383	}

Lines 1-4 Link Here

(-)a/www-client/chromium/files/chromium-launcher.sh (-3 / +7 lines)
1	#!/bin/sh	1	#!/bin/bash
2	#	2	#
3	# Copyright (c) 2009 The Chromium Authors. All rights reserved.	3	# Copyright (c) 2009 The Chromium Authors. All rights reserved.
4	# Use of this source code is governed by a BSD-style license that can be	4	# Use of this source code is governed by a BSD-style license that can be
Lines 19-25 Link Here
19	;;	19	;;
20	esac	20	esac
21		21
		22	SUFFIX=
		23	XDG_CONFIG_HOME=${XDG_CONFIG_HOME:-~/.config}
		24	[[ -n "$SUFFIX" ]] && USER_DATA_DIR=--user-data-dir=$XDG_CONFIG_HOME/chromium$SUFFIX
		25
22	# Set the .desktop file name	26	# Set the .desktop file name
23	export CHROME_DESKTOP="chromium-chromium.desktop"	27	export CHROME_DESKTOP="chromium$SUFFIX-chromium$SUFFIX.desktop"
24		28
25	exec "$PROGDIR/chrome" --extra-plugin-dir=/usr/lib/nsbrowser/plugins "$@"	29	exec -a "chromium$SUFFIX" "$PROGDIR/chrome" --extra-plugin-dir=/usr/lib/nsbrowser/plugins "$USER_DATA_DIR" "$@"

Return to bug 349555