Gentoo Archives: gentoo-commits

From: "Lars Wendler (polynomial-c)" <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-client/icecat: icecat-3.6.16-r1.ebuild icecat-3.6.16-r2.ebuild ChangeLog icecat-5.0-r1.ebuild icecat-4.0.1-r1.ebuild
Date: Tue, 26 Jul 2011 13:11:15
Message-Id: 20110726131103.38FA120051@flycatcher.gentoo.org
1 polynomial-c 11/07/26 13:11:03
2
3 Modified: icecat-3.6.16-r1.ebuild icecat-3.6.16-r2.ebuild
4 ChangeLog icecat-5.0-r1.ebuild
5 icecat-4.0.1-r1.ebuild
6 Log:
7 Fixed compilation with >=curl-7.21.7 (bug #375899)
8
9 (Portage version: 2.2.0_alpha47/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.6 www-client/icecat/icecat-3.6.16-r1.ebuild
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/icecat/icecat-3.6.16-r1.ebuild?rev=1.6&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/icecat/icecat-3.6.16-r1.ebuild?rev=1.6&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/icecat/icecat-3.6.16-r1.ebuild?r1=1.5&r2=1.6
17
18 Index: icecat-3.6.16-r1.ebuild
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/www-client/icecat/icecat-3.6.16-r1.ebuild,v
21 retrieving revision 1.5
22 retrieving revision 1.6
23 diff -u -r1.5 -r1.6
24 --- icecat-3.6.16-r1.ebuild 21 Jun 2011 12:34:27 -0000 1.5
25 +++ icecat-3.6.16-r1.ebuild 26 Jul 2011 13:11:03 -0000 1.6
26 @@ -1,6 +1,6 @@
27 # Copyright 1999-2011 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/icecat-3.6.16-r1.ebuild,v 1.5 2011/06/21 12:34:27 nirbheek Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/icecat-3.6.16-r1.ebuild,v 1.6 2011/07/26 13:11:03 polynomial-c Exp $
31 EAPI="3"
32 WANT_AUTOCONF="2.1"
33
34 @@ -129,6 +129,8 @@
35 # Make this a 3.6.17 version
36 epatch "${DISTDIR}"/ff3617.diff.xz
37
38 + epatch "${FILESDIR}"/${PN}-3.6.16-curl7217-includes-fix.patch
39 +
40 # Integrate rebranding
41 sed -i "s|/firefox|/icecat|" \
42 "${WORKDIR}"/001-firefox_gentoo_install_dirs.patch
43
44
45
46 1.3 www-client/icecat/icecat-3.6.16-r2.ebuild
47
48 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/icecat/icecat-3.6.16-r2.ebuild?rev=1.3&view=markup
49 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/icecat/icecat-3.6.16-r2.ebuild?rev=1.3&content-type=text/plain
50 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/icecat/icecat-3.6.16-r2.ebuild?r1=1.2&r2=1.3
51
52 Index: icecat-3.6.16-r2.ebuild
53 ===================================================================
54 RCS file: /var/cvsroot/gentoo-x86/www-client/icecat/icecat-3.6.16-r2.ebuild,v
55 retrieving revision 1.2
56 retrieving revision 1.3
57 diff -u -r1.2 -r1.3
58 --- icecat-3.6.16-r2.ebuild 23 Jun 2011 11:13:10 -0000 1.2
59 +++ icecat-3.6.16-r2.ebuild 26 Jul 2011 13:11:03 -0000 1.3
60 @@ -1,6 +1,6 @@
61 # Copyright 1999-2011 Gentoo Foundation
62 # Distributed under the terms of the GNU General Public License v2
63 -# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/icecat-3.6.16-r2.ebuild,v 1.2 2011/06/23 11:13:10 polynomial-c Exp $
64 +# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/icecat-3.6.16-r2.ebuild,v 1.3 2011/07/26 13:11:03 polynomial-c Exp $
65 EAPI="3"
66 WANT_AUTOCONF="2.1"
67
68 @@ -130,6 +130,8 @@
69 # Make this a 3.6.17 version
70 epatch "${DISTDIR}"/ff3617.diff.xz "${DISTDIR}"/ff3618.diff.xz
71
72 + epatch "${FILESDIR}"/${PN}-3.6.16-curl7217-includes-fix.patch
73 +
74 # Integrate rebranding
75 sed -i "s|/firefox|/icecat|" \
76 "${WORKDIR}"/001-firefox_gentoo_install_dirs.patch
77
78
79
80 1.93 www-client/icecat/ChangeLog
81
82 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/icecat/ChangeLog?rev=1.93&view=markup
83 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/icecat/ChangeLog?rev=1.93&content-type=text/plain
84 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/icecat/ChangeLog?r1=1.92&r2=1.93
85
86 Index: ChangeLog
87 ===================================================================
88 RCS file: /var/cvsroot/gentoo-x86/www-client/icecat/ChangeLog,v
89 retrieving revision 1.92
90 retrieving revision 1.93
91 diff -u -r1.92 -r1.93
92 --- ChangeLog 6 Jul 2011 23:43:49 -0000 1.92
93 +++ ChangeLog 26 Jul 2011 13:11:03 -0000 1.93
94 @@ -1,6 +1,12 @@
95 # ChangeLog for www-client/icecat
96 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
97 -# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/ChangeLog,v 1.92 2011/07/06 23:43:49 polynomial-c Exp $
98 +# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/ChangeLog,v 1.93 2011/07/26 13:11:03 polynomial-c Exp $
99 +
100 + 26 Jul 2011; Lars Wendler <polynomial-c@g.o> icecat-3.6.16-r1.ebuild,
101 + icecat-3.6.16-r2.ebuild, +files/icecat-3.6.16-curl7217-includes-fix.patch,
102 + icecat-4.0.1-r1.ebuild, icecat-5.0-r1.ebuild,
103 + +files/icecat-5.0-curl7217-includes-fix.patch:
104 + Fixed compilation with >=curl-7.21.7 (bug #375899).
105
106 *icecat-5.0-r1 (06 Jul 2011)
107
108
109
110
111 1.2 www-client/icecat/icecat-5.0-r1.ebuild
112
113 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/icecat/icecat-5.0-r1.ebuild?rev=1.2&view=markup
114 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/icecat/icecat-5.0-r1.ebuild?rev=1.2&content-type=text/plain
115 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/icecat/icecat-5.0-r1.ebuild?r1=1.1&r2=1.2
116
117 Index: icecat-5.0-r1.ebuild
118 ===================================================================
119 RCS file: /var/cvsroot/gentoo-x86/www-client/icecat/icecat-5.0-r1.ebuild,v
120 retrieving revision 1.1
121 retrieving revision 1.2
122 diff -u -r1.1 -r1.2
123 --- icecat-5.0-r1.ebuild 6 Jul 2011 23:43:49 -0000 1.1
124 +++ icecat-5.0-r1.ebuild 26 Jul 2011 13:11:03 -0000 1.2
125 @@ -1,6 +1,6 @@
126 # Copyright 1999-2011 Gentoo Foundation
127 # Distributed under the terms of the GNU General Public License v2
128 -# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/icecat-5.0-r1.ebuild,v 1.1 2011/07/06 23:43:49 polynomial-c Exp $
129 +# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/icecat-5.0-r1.ebuild,v 1.2 2011/07/26 13:11:03 polynomial-c Exp $
130
131 EAPI="3"
132 VIRTUALX_REQUIRED="pgo"
133 @@ -148,7 +148,8 @@
134 EPATCH_FORCE="yes" \
135 epatch "${WORKDIR}"
136
137 - epatch "${FILESDIR}"/2000-icecat-5_gentoo_install_dirs.patch
138 + epatch "${FILESDIR}"/2000-icecat-5_gentoo_install_dirs.patch \
139 + "${FILESDIR}"/${PN}-5.0-curl7217-includes-fix.patch
140
141 # Allow user to apply any additional patches without modifing ebuild
142 epatch_user
143
144
145
146 1.4 www-client/icecat/icecat-4.0.1-r1.ebuild
147
148 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/icecat/icecat-4.0.1-r1.ebuild?rev=1.4&view=markup
149 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/icecat/icecat-4.0.1-r1.ebuild?rev=1.4&content-type=text/plain
150 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/icecat/icecat-4.0.1-r1.ebuild?r1=1.3&r2=1.4
151
152 Index: icecat-4.0.1-r1.ebuild
153 ===================================================================
154 RCS file: /var/cvsroot/gentoo-x86/www-client/icecat/icecat-4.0.1-r1.ebuild,v
155 retrieving revision 1.3
156 retrieving revision 1.4
157 diff -u -r1.3 -r1.4
158 --- icecat-4.0.1-r1.ebuild 21 Jun 2011 12:34:27 -0000 1.3
159 +++ icecat-4.0.1-r1.ebuild 26 Jul 2011 13:11:03 -0000 1.4
160 @@ -1,6 +1,6 @@
161 # Copyright 1999-2011 Gentoo Foundation
162 # Distributed under the terms of the GNU General Public License v2
163 -# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/icecat-4.0.1-r1.ebuild,v 1.3 2011/06/21 12:34:27 nirbheek Exp $
164 +# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/icecat-4.0.1-r1.ebuild,v 1.4 2011/07/26 13:11:03 polynomial-c Exp $
165
166 EAPI="3"
167 WANT_AUTOCONF="2.1"
168 @@ -124,8 +124,9 @@
169 epatch "${WORKDIR}"
170
171 epatch "${FILESDIR}"/2000-icecat_gentoo_install_dirs.patch \
172 - "${FILESDIR}"/5001_fix-prefs-directory.patch
173 - epatch "${FILESDIR}"/fix-preferences-gentoo.patch
174 + "${FILESDIR}"/5001_fix-prefs-directory.patch \
175 + "${FILESDIR}"/fix-preferences-gentoo.patch \
176 + "${FILESDIR}"/${PN}-5.0-curl7217-includes-fix.patch
177
178 # Fix rebranding
179 sed -i 's|\$(DIST)/bin/firefox|\$(DIST)/bin/icecat|' browser/app/Makefile.in