Gentoo Archives: gentoo-commits

From: "Bernard Cafarelli (voyageur)" <voyageur@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-client/chromium-bin: chromium-bin-4.0.295.0_p35884.ebuild chromium-bin-5.0.308.0_p37385.ebuild ChangeLog chromium-bin-9999.ebuild
Date: Thu, 11 Feb 2010 17:02:12
Message-Id: E1NfcQS-0003qr-T0@stork.gentoo.org
1 voyageur 10/02/11 17:02:00
2
3 Modified: chromium-bin-4.0.295.0_p35884.ebuild
4 chromium-bin-5.0.308.0_p37385.ebuild ChangeLog
5 chromium-bin-9999.ebuild
6 Log:
7 Support new path for nss/nspr libs, thanks to Alexandre Rostovtsev <tetromino@×××××.com> in bug #304526
8 (Portage version: 2.2_rc62/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.7 www-client/chromium-bin/chromium-bin-4.0.295.0_p35884.ebuild
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium-bin/chromium-bin-4.0.295.0_p35884.ebuild?rev=1.7&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium-bin/chromium-bin-4.0.295.0_p35884.ebuild?rev=1.7&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium-bin/chromium-bin-4.0.295.0_p35884.ebuild?r1=1.6&r2=1.7
16
17 Index: chromium-bin-4.0.295.0_p35884.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-4.0.295.0_p35884.ebuild,v
20 retrieving revision 1.6
21 retrieving revision 1.7
22 diff -u -r1.6 -r1.7
23 --- chromium-bin-4.0.295.0_p35884.ebuild 11 Feb 2010 12:21:47 -0000 1.6
24 +++ chromium-bin-4.0.295.0_p35884.ebuild 11 Feb 2010 17:01:59 -0000 1.7
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2010 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-4.0.295.0_p35884.ebuild,v 1.6 2010/02/11 12:21:47 phajdan.jr Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-4.0.295.0_p35884.ebuild,v 1.7 2010/02/11 17:01:59 voyageur Exp $
30
31 EAPI="2"
32 inherit eutils multilib portability
33 @@ -81,8 +81,16 @@
34
35 # Create symlinks for needed libraries
36 dodir ${CHROMIUM_HOME}/nss-nspr
37 - NSS_DIR=/usr/$(get_libdir)/nss
38 - NSPR_DIR=/usr/$(get_libdir)/nspr
39 + if has_version ">=dev-libs/nss-3.12.5-r1"; then
40 + NSS_DIR=/usr/$(get_libdir)
41 + else
42 + NSS_DIR=/usr/$(get_libdir)/nss
43 + fi
44 + if has_version ">=dev-libs/nspr-4.8.3-r2"; then
45 + NSPR_DIR=/usr/$(get_libdir)
46 + else
47 + NSPR_DIR=/usr/$(get_libdir)/nspr
48 + fi
49
50 dosym ${NSPR_DIR}/libnspr4.so ${CHROMIUM_HOME}/nss-nspr/libnspr4.so.0d
51 dosym ${NSPR_DIR}/libplc4.so ${CHROMIUM_HOME}/nss-nspr/libplc4.so.0d
52
53
54
55 1.4 www-client/chromium-bin/chromium-bin-5.0.308.0_p37385.ebuild
56
57 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium-bin/chromium-bin-5.0.308.0_p37385.ebuild?rev=1.4&view=markup
58 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium-bin/chromium-bin-5.0.308.0_p37385.ebuild?rev=1.4&content-type=text/plain
59 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium-bin/chromium-bin-5.0.308.0_p37385.ebuild?r1=1.3&r2=1.4
60
61 Index: chromium-bin-5.0.308.0_p37385.ebuild
62 ===================================================================
63 RCS file: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-5.0.308.0_p37385.ebuild,v
64 retrieving revision 1.3
65 retrieving revision 1.4
66 diff -u -r1.3 -r1.4
67 --- chromium-bin-5.0.308.0_p37385.ebuild 11 Feb 2010 12:21:47 -0000 1.3
68 +++ chromium-bin-5.0.308.0_p37385.ebuild 11 Feb 2010 17:01:59 -0000 1.4
69 @@ -1,6 +1,6 @@
70 # Copyright 1999-2010 Gentoo Foundation
71 # Distributed under the terms of the GNU General Public License v2
72 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-5.0.308.0_p37385.ebuild,v 1.3 2010/02/11 12:21:47 phajdan.jr Exp $
73 +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-5.0.308.0_p37385.ebuild,v 1.4 2010/02/11 17:01:59 voyageur Exp $
74
75 EAPI="2"
76 inherit eutils multilib portability
77 @@ -84,8 +84,16 @@
78
79 # Create symlinks for needed libraries
80 dodir ${CHROMIUM_HOME}/nss-nspr
81 - NSS_DIR=/usr/$(get_libdir)/nss
82 - NSPR_DIR=/usr/$(get_libdir)/nspr
83 + if has_version ">=dev-libs/nss-3.12.5-r1"; then
84 + NSS_DIR=/usr/$(get_libdir)
85 + else
86 + NSS_DIR=/usr/$(get_libdir)/nss
87 + fi
88 + if has_version ">=dev-libs/nspr-4.8.3-r2"; then
89 + NSPR_DIR=/usr/$(get_libdir)
90 + else
91 + NSPR_DIR=/usr/$(get_libdir)/nspr
92 + fi
93
94 dosym ${NSPR_DIR}/libnspr4.so ${CHROMIUM_HOME}/nss-nspr/libnspr4.so.0d
95 dosym ${NSPR_DIR}/libplc4.so ${CHROMIUM_HOME}/nss-nspr/libplc4.so.0d
96
97
98
99 1.58 www-client/chromium-bin/ChangeLog
100
101 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium-bin/ChangeLog?rev=1.58&view=markup
102 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium-bin/ChangeLog?rev=1.58&content-type=text/plain
103 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium-bin/ChangeLog?r1=1.57&r2=1.58
104
105 Index: ChangeLog
106 ===================================================================
107 RCS file: /var/cvsroot/gentoo-x86/www-client/chromium-bin/ChangeLog,v
108 retrieving revision 1.57
109 retrieving revision 1.58
110 diff -u -r1.57 -r1.58
111 --- ChangeLog 11 Feb 2010 12:21:47 -0000 1.57
112 +++ ChangeLog 11 Feb 2010 17:01:59 -0000 1.58
113 @@ -1,6 +1,12 @@
114 # ChangeLog for www-client/chromium-bin
115 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
116 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/ChangeLog,v 1.57 2010/02/11 12:21:47 phajdan.jr Exp $
117 +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/ChangeLog,v 1.58 2010/02/11 17:01:59 voyageur Exp $
118 +
119 + 11 Feb 2010; Bernard Cafarelli <voyageur@g.o>
120 + chromium-bin-4.0.295.0_p35884.ebuild,
121 + chromium-bin-5.0.308.0_p37385.ebuild, chromium-bin-9999.ebuild:
122 + Support new path for nss/nspr libs, thanks to Alexandre Rostovtsev
123 + <tetromino@×××××.com> in bug #304526
124
125 11 Feb 2010; Pawel Hajdan jr <phajdan.jr@g.o>
126 -chromium-bin-4.0.266.0_p33995.ebuild,
127
128
129
130 1.34 www-client/chromium-bin/chromium-bin-9999.ebuild
131
132 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium-bin/chromium-bin-9999.ebuild?rev=1.34&view=markup
133 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium-bin/chromium-bin-9999.ebuild?rev=1.34&content-type=text/plain
134 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium-bin/chromium-bin-9999.ebuild?r1=1.33&r2=1.34
135
136 Index: chromium-bin-9999.ebuild
137 ===================================================================
138 RCS file: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-9999.ebuild,v
139 retrieving revision 1.33
140 retrieving revision 1.34
141 diff -u -r1.33 -r1.34
142 --- chromium-bin-9999.ebuild 11 Feb 2010 12:21:47 -0000 1.33
143 +++ chromium-bin-9999.ebuild 11 Feb 2010 17:01:59 -0000 1.34
144 @@ -1,6 +1,6 @@
145 # Copyright 1999-2010 Gentoo Foundation
146 # Distributed under the terms of the GNU General Public License v2
147 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-9999.ebuild,v 1.33 2010/02/11 12:21:47 phajdan.jr Exp $
148 +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-9999.ebuild,v 1.34 2010/02/11 17:01:59 voyageur Exp $
149
150 EAPI="2"
151 inherit eutils multilib portability
152 @@ -89,8 +89,16 @@
153
154 # Create symlinks for needed libraries
155 dodir ${CHROMIUM_HOME}/nss-nspr
156 - NSS_DIR=/usr/$(get_libdir)/nss
157 - NSPR_DIR=/usr/$(get_libdir)/nspr
158 + if has_version ">=dev-libs/nss-3.12.5-r1"; then
159 + NSS_DIR=/usr/$(get_libdir)
160 + else
161 + NSS_DIR=/usr/$(get_libdir)/nss
162 + fi
163 + if has_version ">=dev-libs/nspr-4.8.3-r2"; then
164 + NSPR_DIR=/usr/$(get_libdir)
165 + else
166 + NSPR_DIR=/usr/$(get_libdir)/nspr
167 + fi
168
169 dosym ${NSPR_DIR}/libnspr4.so ${CHROMIUM_HOME}/nss-nspr/libnspr4.so.0d
170 dosym ${NSPR_DIR}/libplc4.so ${CHROMIUM_HOME}/nss-nspr/libplc4.so.0d