Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 349555 | Differences between
and this patch

Collapse All | Expand All

(-)gentoo/tree/www-client/chromium/chromium-9999.ebuild (-7 / +13 lines)
Lines 15-21 Link Here
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 49-54 Link Here
49
	>=dev-util/pkgconfig-0.23
49
	>=dev-util/pkgconfig-0.23
50
	sys-devel/flex"
50
	sys-devel/flex"
51
RDEPEND+="
51
RDEPEND+="
52
	!=www-client/chromium-9999
52
	|| (
53
	|| (
53
		x11-themes/gnome-icon-theme
54
		x11-themes/gnome-icon-theme
54
		x11-themes/oxygen-molecule
55
		x11-themes/oxygen-molecule
Lines 122-128 Link Here
122
}
123
}
123
124
124
pkg_setup() {
125
pkg_setup() {
125
	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
126
	SUFFIX="-${SLOT}"
127
	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${SUFFIX}"
126
128
127
	# 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.
128
	tc-export AR CC CXX RANLIB
130
	tc-export AR CC CXX RANLIB
Lines 351-358 Link Here
351
	doins -r out/Release/resources || die
353
	doins -r out/Release/resources || die
352
354
353
	# chrome.1 is for chromium --help
355
	# chrome.1 is for chromium --help
354
	newman out/Release/chrome.1 chrome.1 || die
356
	newman out/Release/chrome.1 chrome${SUFFIX}.1 || die
355
	newman out/Release/chrome.1 chromium.1 || die
357
	newman out/Release/chrome.1 chromium${SUFFIX}.1 || die
356
358
357
	# Chromium looks for these in its folder
359
	# Chromium looks for these in its folder
358
	# See media_posix.cc and base_paths_linux.cc
360
	# See media_posix.cc and base_paths_linux.cc
Lines 361-369 Link Here
361
	dosym /usr/$(get_libdir)/libavutil.so.50 "${CHROMIUM_HOME}" || die
363
	dosym /usr/$(get_libdir)/libavutil.so.50 "${CHROMIUM_HOME}" || die
362
364
363
	# Install icon and desktop entry.
365
	# Install icon and desktop entry.
364
	newicon out/Release/product_logo_48.png ${PN}-browser.png || die
366
	newicon out/Release/product_logo_48.png ${PN}${SUFFIX}-browser.png || die
365
	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium || die
367
	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${SUFFIX} || die
366
	make_desktop_entry chromium "Chromium" ${PN}-browser "Network;WebBrowser" \
368
	sed "s:plugins:plugins --user-data-dir=${HOME}/.config/chromium-live:" \
369
		-i "${CHROMIUM_HOME}/chromium-launcher.sh"
370
	make_desktop_entry chromium${SUFFIX} "Chromium" ${PN}${SUFFIX}-browser "Network;WebBrowser" \
367
		"MimeType=text/html;text/xml;application/xhtml+xml;"
371
		"MimeType=text/html;text/xml;application/xhtml+xml;"
368
	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
369
373
Lines 372-376 Link Here
372
		dodir /usr/share/gnome-control-center/default-apps || die
376
		dodir /usr/share/gnome-control-center/default-apps || die
373
		insinto /usr/share/gnome-control-center/default-apps
377
		insinto /usr/share/gnome-control-center/default-apps
374
		doins "${FILESDIR}"/chromium.xml || die
378
		doins "${FILESDIR}"/chromium.xml || die
379
		sed "s:chromium:chromium${SUFFIX}:g" -i \
380
			/usr/share/gnome-control-center/default-apps/chromium${SUFFIX}.xml
375
	fi
381
	fi
376
}
382
}

Return to bug 349555