diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2013-09-21 20:58:52 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2013-09-21 20:58:52 +0000 |
| commit | bc109e6084d65ecab6805e53f32e571480838f45 (patch) | |
| tree | 6f4236c2d8bb5287f632b618c50b975ea1290801 /www-client/google-chrome | |
| parent | Remove MULTILIB_USEDEP on packages not having the flags. (diff) | |
| download | gentoo-2-bc109e6084d65ecab6805e53f32e571480838f45.tar.gz gentoo-2-bc109e6084d65ecab6805e53f32e571480838f45.tar.bz2 gentoo-2-bc109e6084d65ecab6805e53f32e571480838f45.zip | |
Fix installation.
(Portage version: 2.2.6/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'www-client/google-chrome')
| -rw-r--r-- | www-client/google-chrome/ChangeLog | 6 | ||||
| -rw-r--r-- | www-client/google-chrome/google-chrome-31.0.1636.0_alpha1.ebuild | 29 |
2 files changed, 19 insertions, 16 deletions
diff --git a/www-client/google-chrome/ChangeLog b/www-client/google-chrome/ChangeLog index d0ccabf9a9f2..4446c0f05699 100644 --- a/www-client/google-chrome/ChangeLog +++ b/www-client/google-chrome/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-client/google-chrome # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/ChangeLog,v 1.319 2013/09/21 20:33:02 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/ChangeLog,v 1.320 2013/09/21 20:58:52 floppym Exp $ + + 21 Sep 2013; Mike Gilbert <floppym@gentoo.org> + google-chrome-31.0.1636.0_alpha1.ebuild: + Fix installation. *google-chrome-31.0.1636.0_alpha1 (21 Sep 2013) diff --git a/www-client/google-chrome/google-chrome-31.0.1636.0_alpha1.ebuild b/www-client/google-chrome/google-chrome-31.0.1636.0_alpha1.ebuild index 69fcd4900c0d..dd306a29f249 100644 --- a/www-client/google-chrome/google-chrome-31.0.1636.0_alpha1.ebuild +++ b/www-client/google-chrome/google-chrome-31.0.1636.0_alpha1.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/google-chrome/google-chrome-31.0.1636.0_alpha1.ebuild,v 1.1 2013/09/21 20:33:02 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-31.0.1636.0_alpha1.ebuild,v 1.2 2013/09/21 20:58:52 floppym Exp $ EAPI="4" @@ -93,36 +93,35 @@ pkg_nofetch() { } pkg_setup() { - CHROME_HOME="opt/google/chrome/" chromium_suid_sandbox_check_kernel_config } src_install() { - pax-mark m ${CHROME_HOME}chrome - rm -rf usr/share/menu || die - mv usr/share/doc/${PN} usr/share/doc/${PF} || die - - pushd "${CHROME_HOME}locales" > /dev/null || die - chromium_remove_language_paks - popd + CHROME_HOME="opt/google/chrome-${SLOT}" mv opt usr "${D}" || die + cd "${D}" || die - fperms u+s "/${CHROME_HOME}chrome-sandbox" || die + pax-mark m "${CHROME_HOME}/chrome" + chmod u+s "${CHROME_HOME}/chrome-sandbox" || die + rm -rf usr/share/menu || die + mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die + dosym /usr/$(get_libdir)/libudev.so "${CHROME_HOME}/libudev.so.0" - dosym /usr/$(get_libdir)/libudev.so ${CHROME_HOME}/libudev.so.0 + pushd "${CHROME_HOME}/locales" > /dev/null || die + chromium_remove_language_paks + popd > /dev/null || die if use plugins ; then local plugins="--extra-plugin-dir=/usr/$(get_libdir)/nsbrowser/plugins" sed -e "/^exec/ i set -- \"${plugins}\" \"\$@\"" \ - -i "${D}${CHROME_HOME}google-chrome" || die + -i "${CHROME_HOME}/${MY_PN}" || die fi - domenu "${D}${CHROME_HOME}google-chrome.desktop" || die + domenu "${CHROME_HOME}/${MY_PN}.desktop" || die local size for size in 16 22 24 32 48 64 128 256 ; do - insinto /usr/share/icons/hicolor/${size}x${size}/apps - newins "${D}${CHROME_HOME}product_logo_${size}.png" google-chrome.png + newicon -s ${size} "${CHROME_HOME}/product_logo_${size}.png" ${MY_PN}.png done } |