Gentoo Archives: gentoo-commits

From: "Mike Gilbert (floppym)" <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-client/google-chrome-unstable: google-chrome-unstable-35.0.1862.2_p1.ebuild ChangeLog
Date: Sat, 01 Mar 2014 18:16:35
Message-Id: 20140301181632.3189C2004C@flycatcher.gentoo.org
1 floppym 14/03/01 18:16:32
2
3 Modified: google-chrome-unstable-35.0.1862.2_p1.ebuild
4 ChangeLog
5 Log:
6 Stop bundling libgcrypt now that a compatibility slot exists.
7
8 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
9
10 Revision Changes Path
11 1.2 www-client/google-chrome-unstable/google-chrome-unstable-35.0.1862.2_p1.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/google-chrome-unstable/google-chrome-unstable-35.0.1862.2_p1.ebuild?rev=1.2&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/google-chrome-unstable/google-chrome-unstable-35.0.1862.2_p1.ebuild?rev=1.2&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/google-chrome-unstable/google-chrome-unstable-35.0.1862.2_p1.ebuild?r1=1.1&r2=1.2
16
17 Index: google-chrome-unstable-35.0.1862.2_p1.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/www-client/google-chrome-unstable/google-chrome-unstable-35.0.1862.2_p1.ebuild,v
20 retrieving revision 1.1
21 retrieving revision 1.2
22 diff -u -r1.1 -r1.2
23 --- google-chrome-unstable-35.0.1862.2_p1.ebuild 28 Feb 2014 01:18:00 -0000 1.1
24 +++ google-chrome-unstable-35.0.1862.2_p1.ebuild 1 Mar 2014 18:16:31 -0000 1.2
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2014 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome-unstable/google-chrome-unstable-35.0.1862.2_p1.ebuild,v 1.1 2014/02/28 01:18:00 floppym Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome-unstable/google-chrome-unstable-35.0.1862.2_p1.ebuild,v 1.2 2014/03/01 18:16:31 floppym Exp $
30
31 EAPI="5"
32
33 @@ -21,17 +21,12 @@
34
35 MY_P="${MY_PN}_${PV/_p/-}"
36
37 -# Bundle a copy of libgcrypt, bug 494596
38 -LIBGCRYPT="libgcrypt.so.11.8.2"
39 -
40 SRC_URI="
41 amd64? (
42 http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb
43 - http://dev.gentoo.org/~floppym/dist/${LIBGCRYPT}-amd64.xz
44 )
45 x86? (
46 http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_i386.deb
47 - http://dev.gentoo.org/~floppym/dist/${LIBGCRYPT}-x86.xz
48 )
49 "
50
51 @@ -47,7 +42,7 @@
52 dev-libs/atk
53 dev-libs/expat
54 dev-libs/glib:2
55 - dev-libs/libgcrypt
56 + || ( dev-libs/libgcrypt:11 dev-libs/libgcrypt:0/11 )
57 dev-libs/nspr
58 dev-libs/nss
59 gnome-base/gconf:2
60 @@ -158,9 +153,6 @@
61 pax-mark m "${ED}${CHROME_HOME}/chrome"
62 dosym /usr/$(get_libdir)/libudev.so "${CHROME_HOME}/libudev.so.0"
63
64 - insinto "${CHROME_HOME}"
65 - newins "${WORKDIR}/${LIBGCRYPT}-$(usev amd64)$(usev x86)" libgcrypt.so.11
66 -
67 readme.gentoo_create_doc
68 }
69
70
71
72
73 1.12 www-client/google-chrome-unstable/ChangeLog
74
75 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/google-chrome-unstable/ChangeLog?rev=1.12&view=markup
76 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/google-chrome-unstable/ChangeLog?rev=1.12&content-type=text/plain
77 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/google-chrome-unstable/ChangeLog?r1=1.11&r2=1.12
78
79 Index: ChangeLog
80 ===================================================================
81 RCS file: /var/cvsroot/gentoo-x86/www-client/google-chrome-unstable/ChangeLog,v
82 retrieving revision 1.11
83 retrieving revision 1.12
84 diff -u -r1.11 -r1.12
85 --- ChangeLog 28 Feb 2014 01:18:00 -0000 1.11
86 +++ ChangeLog 1 Mar 2014 18:16:32 -0000 1.12
87 @@ -1,6 +1,10 @@
88 # ChangeLog for www-client/google-chrome-unstable
89 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
90 -# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome-unstable/ChangeLog,v 1.11 2014/02/28 01:18:00 floppym Exp $
91 +# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome-unstable/ChangeLog,v 1.12 2014/03/01 18:16:32 floppym Exp $
92 +
93 + 01 Mar 2014; Mike Gilbert <floppym@g.o>
94 + google-chrome-unstable-35.0.1862.2_p1.ebuild:
95 + Stop bundling libgcrypt now that a compatibility slot exists.
96
97 *google-chrome-unstable-35.0.1862.2_p1 (28 Feb 2014)