diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2013-03-24 22:54:13 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2013-03-24 22:54:13 +0000 |
| commit | df21b4e0ef0c53b18627b98b27b6a2317673f404 (patch) | |
| tree | 4d55bd593dc421a8682cf102141cd43ce963234c /www-client | |
| parent | Version bump. (diff) | |
| download | gentoo-2-df21b4e0ef0c53b18627b98b27b6a2317673f404.tar.gz gentoo-2-df21b4e0ef0c53b18627b98b27b6a2317673f404.tar.bz2 gentoo-2-df21b4e0ef0c53b18627b98b27b6a2317673f404.zip | |
Revert back to the symlink trick for libudev; having libudev.so.0 and libudev.so.1 loaded in the same process causes problems. Bug 458320.
(Portage version: 2.2.0_alpha169/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'www-client')
4 files changed, 17 insertions, 10 deletions
diff --git a/www-client/google-chrome/ChangeLog b/www-client/google-chrome/ChangeLog index fa2a15a2ec8a..2a96bf41b1b9 100644 --- a/www-client/google-chrome/ChangeLog +++ b/www-client/google-chrome/ChangeLog @@ -1,6 +1,13 @@ # 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.259 2013/03/23 12:45:16 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/ChangeLog,v 1.260 2013/03/24 22:54:13 floppym Exp $ + + 24 Mar 2013; Mike Gilbert <floppym@gentoo.org> + google-chrome-25.0.1364.172_p187217.ebuild, + google-chrome-26.0.1410.40_beta189199.ebuild, + google-chrome-27.0.1448.0_alpha189523.ebuild: + Revert back to the symlink trick for libudev; having libudev.so.0 and + libudev.so.1 loaded in the same process causes problems. Bug 458320. *google-chrome-27.0.1448.0_alpha189523 (23 Mar 2013) diff --git a/www-client/google-chrome/google-chrome-25.0.1364.172_p187217.ebuild b/www-client/google-chrome/google-chrome-25.0.1364.172_p187217.ebuild index 7b4605b31661..e86c8c5706aa 100644 --- a/www-client/google-chrome/google-chrome-25.0.1364.172_p187217.ebuild +++ b/www-client/google-chrome/google-chrome-25.0.1364.172_p187217.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-25.0.1364.172_p187217.ebuild,v 1.1 2013/03/12 23:28:33 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-25.0.1364.172_p187217.ebuild,v 1.2 2013/03/24 22:54:13 floppym Exp $ EAPI="4" @@ -37,11 +37,9 @@ MY_P="${MY_PN}_${MY_PV}" SRC_URI=" amd64? ( http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb - mirror://gentoo/google-chrome-libudev-0.13.1-amd64.tar.xz ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_i386.deb - mirror://gentoo/google-chrome-libudev-0.13.1-x86.tar.xz ) " @@ -112,6 +110,8 @@ src_install() { fperms u+s "/${CHROME_HOME}chrome-sandbox" || die + dosym /usr/$(get_libdir)/libudev.so ${CHROME_HOME}/libudev.so.0 + if use plugins ; then local plugins="--extra-plugin-dir=/usr/$(get_libdir)/nsbrowser/plugins" sed -e "/^exec/ i set -- \"${plugins}\" \"\$@\"" \ diff --git a/www-client/google-chrome/google-chrome-26.0.1410.40_beta189199.ebuild b/www-client/google-chrome/google-chrome-26.0.1410.40_beta189199.ebuild index 13b6e3613d64..d833c4a2359d 100644 --- a/www-client/google-chrome/google-chrome-26.0.1410.40_beta189199.ebuild +++ b/www-client/google-chrome/google-chrome-26.0.1410.40_beta189199.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-26.0.1410.40_beta189199.ebuild,v 1.1 2013/03/21 00:56:11 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-26.0.1410.40_beta189199.ebuild,v 1.2 2013/03/24 22:54:13 floppym Exp $ EAPI="4" @@ -37,11 +37,9 @@ MY_P="${MY_PN}_${MY_PV}" SRC_URI=" amd64? ( http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb - mirror://gentoo/google-chrome-libudev-0.13.1-amd64.tar.xz ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_i386.deb - mirror://gentoo/google-chrome-libudev-0.13.1-x86.tar.xz ) " @@ -112,6 +110,8 @@ src_install() { fperms u+s "/${CHROME_HOME}chrome-sandbox" || die + dosym /usr/$(get_libdir)/libudev.so ${CHROME_HOME}/libudev.so.0 + if use plugins ; then local plugins="--extra-plugin-dir=/usr/$(get_libdir)/nsbrowser/plugins" sed -e "/^exec/ i set -- \"${plugins}\" \"\$@\"" \ diff --git a/www-client/google-chrome/google-chrome-27.0.1448.0_alpha189523.ebuild b/www-client/google-chrome/google-chrome-27.0.1448.0_alpha189523.ebuild index 76a1f12fa3c1..dec7367a0cd5 100644 --- a/www-client/google-chrome/google-chrome-27.0.1448.0_alpha189523.ebuild +++ b/www-client/google-chrome/google-chrome-27.0.1448.0_alpha189523.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-27.0.1448.0_alpha189523.ebuild,v 1.1 2013/03/23 12:45:16 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-27.0.1448.0_alpha189523.ebuild,v 1.2 2013/03/24 22:54:13 floppym Exp $ EAPI="4" @@ -37,11 +37,9 @@ MY_P="${MY_PN}_${MY_PV}" SRC_URI=" amd64? ( http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb - mirror://gentoo/google-chrome-libudev-0.13.1-amd64.tar.xz ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_i386.deb - mirror://gentoo/google-chrome-libudev-0.13.1-x86.tar.xz ) " @@ -112,6 +110,8 @@ src_install() { fperms u+s "/${CHROME_HOME}chrome-sandbox" || die + dosym /usr/$(get_libdir)/libudev.so ${CHROME_HOME}/libudev.so.0 + if use plugins ; then local plugins="--extra-plugin-dir=/usr/$(get_libdir)/nsbrowser/plugins" sed -e "/^exec/ i set -- \"${plugins}\" \"\$@\"" \ |