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