Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-chemistry/cns: cns-1.2.1-r3.ebuild cns-1.2.1-r2.ebuild cns-1.2.1-r1.ebuild ChangeLog cns-1.2.1.ebuild cns-1.2.1-r4.ebuild
Date: Mon, 28 Jun 2010 21:05:50
Message-Id: 20100628210546.CB8792C621@corvid.gentoo.org
1 jlec 10/06/28 21:05:46
2
3 Modified: cns-1.2.1-r3.ebuild cns-1.2.1-r2.ebuild
4 cns-1.2.1-r1.ebuild ChangeLog cns-1.2.1.ebuild
5 cns-1.2.1-r4.ebuild
6 Log:
7 Removed blocking of dos2unix
8 (Portage version: 2.2_rc67/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.2 sci-chemistry/cns/cns-1.2.1-r3.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r3.ebuild?rev=1.2&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r3.ebuild?rev=1.2&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r3.ebuild?r1=1.1&r2=1.2
16
17 Index: cns-1.2.1-r3.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r3.ebuild,v
20 retrieving revision 1.1
21 retrieving revision 1.2
22 diff -u -r1.1 -r1.2
23 --- cns-1.2.1-r3.ebuild 20 Mar 2010 13:33:12 -0000 1.1
24 +++ cns-1.2.1-r3.ebuild 28 Jun 2010 21:05:46 -0000 1.2
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/sci-chemistry/cns/cns-1.2.1-r3.ebuild,v 1.1 2010/03/20 13:33:12 jlec Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r3.ebuild,v 1.2 2010/06/28 21:05:46 jlec Exp $
30
31 EAPI="3"
32
33 @@ -20,8 +20,7 @@
34 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
35 IUSE="aria openmp"
36
37 -RDEPEND="app-shells/tcsh
38 - !app-text/dos2unix"
39 +RDEPEND="app-shells/tcsh"
40 DEPEND="${RDEPEND}"
41 PDEPEND="aria? ( ~sci-chemistry/aria-2.3.1 )"
42
43 @@ -196,6 +195,8 @@
44 -A iq,cgi,csh,cv,def,fm,gif,hkl,inp,jpeg,lib,link,list,mask,mtf,param,pdb,pdf,pl,ps,sc,sca,sdb,seq,tbl,top \
45 -f all_cns_info_template,omac,def \
46 -r doc/html/* || die
47 + # Conflits with app-text/dos2unix
48 + rm -f "${D}"/usr/bin/dos2unix
49 }
50
51 pkg_info() {
52
53
54
55 1.3 sci-chemistry/cns/cns-1.2.1-r2.ebuild
56
57 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r2.ebuild?rev=1.3&view=markup
58 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r2.ebuild?rev=1.3&content-type=text/plain
59 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r2.ebuild?r1=1.2&r2=1.3
60
61 Index: cns-1.2.1-r2.ebuild
62 ===================================================================
63 RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r2.ebuild,v
64 retrieving revision 1.2
65 retrieving revision 1.3
66 diff -u -r1.2 -r1.3
67 --- cns-1.2.1-r2.ebuild 7 Mar 2010 09:54:15 -0000 1.2
68 +++ cns-1.2.1-r2.ebuild 28 Jun 2010 21:05:46 -0000 1.3
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/sci-chemistry/cns/cns-1.2.1-r2.ebuild,v 1.2 2010/03/07 09:54:15 jlec Exp $
73 +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r2.ebuild,v 1.3 2010/06/28 21:05:46 jlec Exp $
74
75 EAPI="3"
76
77 @@ -20,8 +20,7 @@
78 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
79 IUSE="aria openmp"
80
81 -RDEPEND="app-shells/tcsh
82 - !app-text/dos2unix"
83 +RDEPEND="app-shells/tcsh"
84 DEPEND="${RDEPEND}"
85 PDEPEND="aria? ( sci-chemistry/aria )"
86
87 @@ -194,6 +193,9 @@
88 -A iq,cgi,csh,cv,def,fm,gif,hkl,inp,jpeg,lib,link,list,mask,mtf,param,pdb,pdf,pl,ps,sc,sca,sdb,seq,tbl,top \
89 -f all_cns_info_template,omac,def \
90 -r doc/html/* || die
91 +
92 + # Conflits with app-text/dos2unix
93 + rm -f "${D}"/usr/bin/dos2unix
94 }
95
96 pkg_info() {
97
98
99
100 1.3 sci-chemistry/cns/cns-1.2.1-r1.ebuild
101
102 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r1.ebuild?rev=1.3&view=markup
103 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r1.ebuild?rev=1.3&content-type=text/plain
104 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r1.ebuild?r1=1.2&r2=1.3
105
106 Index: cns-1.2.1-r1.ebuild
107 ===================================================================
108 RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r1.ebuild,v
109 retrieving revision 1.2
110 retrieving revision 1.3
111 diff -u -r1.2 -r1.3
112 --- cns-1.2.1-r1.ebuild 6 Feb 2010 12:02:19 -0000 1.2
113 +++ cns-1.2.1-r1.ebuild 28 Jun 2010 21:05:46 -0000 1.3
114 @@ -1,6 +1,6 @@
115 # Copyright 1999-2010 Gentoo Foundation
116 # Distributed under the terms of the GNU General Public License v2
117 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r1.ebuild,v 1.2 2010/02/06 12:02:19 jlec Exp $
118 +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r1.ebuild,v 1.3 2010/06/28 21:05:46 jlec Exp $
119
120 EAPI="2"
121
122 @@ -19,8 +19,7 @@
123 KEYWORDS="~amd64 ~x86"
124 IUSE="openmp"
125
126 -RDEPEND="app-shells/tcsh
127 - !app-text/dos2unix"
128 +RDEPEND="app-shells/tcsh"
129 DEPEND="${RDEPEND}"
130
131 RESTRICT="fetch"
132 @@ -176,7 +175,10 @@
133 dohtml \
134 -A iq,cgi,csh,cv,def,fm,gif,hkl,inp,jpeg,lib,link,list,mask,mtf,param,pdb,pdf,pl,ps,sc,sca,sdb,seq,tbl,top \
135 -f all_cns_info_template,omac,def \
136 - -r doc/html/*
137 + -r doc/html/* || die
138 +
139 + # Conflits with app-text/dos2unix
140 + rm -f "${D}"/usr/bin/dos2unix
141 }
142
143 pkg_info() {
144
145
146
147 1.24 sci-chemistry/cns/ChangeLog
148
149 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/cns/ChangeLog?rev=1.24&view=markup
150 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/cns/ChangeLog?rev=1.24&content-type=text/plain
151 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/cns/ChangeLog?r1=1.23&r2=1.24
152
153 Index: ChangeLog
154 ===================================================================
155 RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/cns/ChangeLog,v
156 retrieving revision 1.23
157 retrieving revision 1.24
158 diff -u -r1.23 -r1.24
159 --- ChangeLog 5 Apr 2010 21:15:30 -0000 1.23
160 +++ ChangeLog 28 Jun 2010 21:05:46 -0000 1.24
161 @@ -1,6 +1,11 @@
162 # ChangeLog for sci-chemistry/cns
163 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
164 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/ChangeLog,v 1.23 2010/04/05 21:15:30 jlec Exp $
165 +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/ChangeLog,v 1.24 2010/06/28 21:05:46 jlec Exp $
166 +
167 + 28 Jun 2010; Justin Lecher <jlec@g.o> cns-1.2.1.ebuild,
168 + cns-1.2.1-r1.ebuild, cns-1.2.1-r2.ebuild, cns-1.2.1-r3.ebuild,
169 + cns-1.2.1-r4.ebuild:
170 + Removed blocking of dos2unix
171
172 *cns-1.2.1-r4 (05 Apr 2010)
173
174
175
176
177 1.6 sci-chemistry/cns/cns-1.2.1.ebuild
178
179 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/cns/cns-1.2.1.ebuild?rev=1.6&view=markup
180 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/cns/cns-1.2.1.ebuild?rev=1.6&content-type=text/plain
181 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/cns/cns-1.2.1.ebuild?r1=1.5&r2=1.6
182
183 Index: cns-1.2.1.ebuild
184 ===================================================================
185 RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1.ebuild,v
186 retrieving revision 1.5
187 retrieving revision 1.6
188 diff -u -r1.5 -r1.6
189 --- cns-1.2.1.ebuild 6 Feb 2010 21:49:39 -0000 1.5
190 +++ cns-1.2.1.ebuild 28 Jun 2010 21:05:46 -0000 1.6
191 @@ -1,6 +1,6 @@
192 -# Copyright 1999-2009 Gentoo Foundation
193 +# Copyright 1999-2010 Gentoo Foundation
194 # Distributed under the terms of the GNU General Public License v2
195 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1.ebuild,v 1.5 2010/02/06 21:49:39 jlec Exp $
196 +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1.ebuild,v 1.6 2010/06/28 21:05:46 jlec Exp $
197
198 inherit eutils fortran toolchain-funcs versionator flag-o-matic
199
200 @@ -17,8 +17,7 @@
201 SLOT="0"
202 KEYWORDS="amd64 ~ppc ~x86"
203 IUSE="openmp"
204 -RDEPEND="app-shells/tcsh
205 - !app-text/dos2unix"
206 +RDEPEND="app-shells/tcsh"
207 DEPEND="${RDEPEND}"
208 S="${WORKDIR}/${MY_P}"
209
210 @@ -171,6 +170,8 @@
211 -A iq,cgi,csh,cv,def,fm,gif,hkl,inp,jpeg,lib,link,list,mask,mtf,param,pdb,pdf,pl,ps,sc,sca,sdb,seq,tbl,top \
212 -f all_cns_info_template,omac,def \
213 -r doc/html/*
214 + # Conflits with app-text/dos2unix
215 + rm -f "${D}"/usr/bin/dos2unix
216 }
217
218 pkg_info() {
219
220
221
222 1.2 sci-chemistry/cns/cns-1.2.1-r4.ebuild
223
224 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r4.ebuild?rev=1.2&view=markup
225 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r4.ebuild?rev=1.2&content-type=text/plain
226 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r4.ebuild?r1=1.1&r2=1.2
227
228 Index: cns-1.2.1-r4.ebuild
229 ===================================================================
230 RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r4.ebuild,v
231 retrieving revision 1.1
232 retrieving revision 1.2
233 diff -u -r1.1 -r1.2
234 --- cns-1.2.1-r4.ebuild 5 Apr 2010 21:15:30 -0000 1.1
235 +++ cns-1.2.1-r4.ebuild 28 Jun 2010 21:05:46 -0000 1.2
236 @@ -1,6 +1,6 @@
237 # Copyright 1999-2010 Gentoo Foundation
238 # Distributed under the terms of the GNU General Public License v2
239 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r4.ebuild,v 1.1 2010/04/05 21:15:30 jlec Exp $
240 +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r4.ebuild,v 1.2 2010/06/28 21:05:46 jlec Exp $
241
242 EAPI="3"
243
244 @@ -20,8 +20,7 @@
245 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
246 IUSE="aria openmp"
247
248 -RDEPEND="app-shells/tcsh
249 - !app-text/dos2unix"
250 +RDEPEND="app-shells/tcsh"
251 DEPEND="${RDEPEND}"
252 PDEPEND="aria? ( ~sci-chemistry/aria-2.3.1 )"
253
254 @@ -207,6 +206,8 @@
255 -A iq,cgi,csh,cv,def,fm,gif,hkl,inp,jpeg,lib,link,list,mask,mtf,param,pdb,pdf,pl,ps,sc,sca,sdb,seq,tbl,top \
256 -f all_cns_info_template,omac,def \
257 -r doc/html/* || die
258 + # Conflits with app-text/dos2unix
259 + rm -f "${D}"/usr/bin/dos2unix
260 }
261
262 pkg_info() {