diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2014-03-01 18:16:04 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2014-03-01 18:16:04 +0000 |
| commit | d1f32d97d7c267e8de02f714d1ec32509bc82bac (patch) | |
| tree | 7220eb47fcd43439ddd9a93f1bc0e21722f2a23e /www-client | |
| parent | Version bump. (diff) | |
| download | gentoo-2-d1f32d97d7c267e8de02f714d1ec32509bc82bac.tar.gz gentoo-2-d1f32d97d7c267e8de02f714d1ec32509bc82bac.tar.bz2 gentoo-2-d1f32d97d7c267e8de02f714d1ec32509bc82bac.zip | |
Stop bundling libgcrypt now that a compatibility slot exists.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'www-client')
| -rw-r--r-- | www-client/google-chrome/ChangeLog | 6 | ||||
| -rw-r--r-- | www-client/google-chrome/google-chrome-33.0.1750.117_p1.ebuild | 12 |
2 files changed, 7 insertions, 11 deletions
diff --git a/www-client/google-chrome/ChangeLog b/www-client/google-chrome/ChangeLog index 40a1c6a9bf6b..06bb3c05d3a5 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-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/ChangeLog,v 1.369 2014/02/24 04:08:38 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/ChangeLog,v 1.370 2014/03/01 18:16:04 floppym Exp $ + + 01 Mar 2014; Mike Gilbert <floppym@gentoo.org> + google-chrome-33.0.1750.117_p1.ebuild: + Stop bundling libgcrypt now that a compatibility slot exists. 24 Feb 2014; Mike Gilbert <floppym@gentoo.org> google-chrome-33.0.1750.117_p1.ebuild: diff --git a/www-client/google-chrome/google-chrome-33.0.1750.117_p1.ebuild b/www-client/google-chrome/google-chrome-33.0.1750.117_p1.ebuild index 3f8a80071ab1..2bd597ac12d6 100644 --- a/www-client/google-chrome/google-chrome-33.0.1750.117_p1.ebuild +++ b/www-client/google-chrome/google-chrome-33.0.1750.117_p1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-33.0.1750.117_p1.ebuild,v 1.2 2014/02/24 04:08:38 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-33.0.1750.117_p1.ebuild,v 1.3 2014/03/01 18:16:03 floppym Exp $ EAPI="5" @@ -21,17 +21,12 @@ fi MY_P="${MY_PN}_${PV/_p/-}" -# Bundle a copy of libgcrypt, bug 494596 -LIBGCRYPT="libgcrypt.so.11.8.2" - SRC_URI=" amd64? ( http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb - http://dev.gentoo.org/~floppym/dist/${LIBGCRYPT}-amd64.xz ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_i386.deb - http://dev.gentoo.org/~floppym/dist/${LIBGCRYPT}-x86.xz ) " @@ -47,7 +42,7 @@ RDEPEND=" dev-libs/atk dev-libs/expat dev-libs/glib:2 - dev-libs/libgcrypt + || ( dev-libs/libgcrypt:11 dev-libs/libgcrypt:0/11 ) dev-libs/nspr dev-libs/nss gnome-base/gconf:2 @@ -158,9 +153,6 @@ src_install() { pax-mark m "${ED}${CHROME_HOME}/chrome" dosym /usr/$(get_libdir)/libudev.so "${CHROME_HOME}/libudev.so.0" - insinto "${CHROME_HOME}" - newins "${WORKDIR}/${LIBGCRYPT}-$(usev amd64)$(usev x86)" libgcrypt.so.11 - readme.gentoo_create_doc } |