diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2013-07-14 00:34:32 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2013-07-14 00:34:32 +0000 |
| commit | 41b96b4b8cd34eaffdaa4467918be0b87e151c71 (patch) | |
| tree | d5996e771bd15be541968b3e036e1952b7ae093c /www-client/chromium/chromium-9999-r1.ebuild | |
| parent | fix locale bug via revbump (diff) | |
| download | historical-41b96b4b8cd34eaffdaa4467918be0b87e151c71.tar.gz historical-41b96b4b8cd34eaffdaa4467918be0b87e151c71.tar.bz2 historical-41b96b4b8cd34eaffdaa4467918be0b87e151c71.zip | |
Fix multilib path for plugins, bug 476778.
Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4
Diffstat (limited to 'www-client/chromium/chromium-9999-r1.ebuild')
| -rw-r--r-- | www-client/chromium/chromium-9999-r1.ebuild | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild index 8dd5fe31276b..e3c118161ba6 100644 --- a/www-client/chromium/chromium-9999-r1.ebuild +++ b/www-client/chromium/chromium-9999-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.201 2013/06/27 15:05:23 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.202 2013/07/14 00:34:28 floppym Exp $ EAPI="5" PYTHON_COMPAT=( python{2_6,2_7} ) @@ -551,15 +551,16 @@ src_install() { doins out/Release/libppGoogleNaClPluginChrome.so || die fi - newexe "${FILESDIR}"/chromium-launcher-r3.sh chromium-launcher.sh || die - if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then - sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" \ - -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die - sed "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g" \ - -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die - sed "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:" \ - -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die + local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" ) + if [[ -n ${CHROMIUM_SUFFIX} ]]; then + sedargs+=( + -e "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" + -e "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g" + -e "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:" + ) fi + sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die + doexe chromium-launcher.sh # It is important that we name the target "chromium-browser", # xdg-utils expect it; bug #355517. |