Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Benedikt Boehm (hollow)" <hollow@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-chemistry/webmo: webmo-7.0.003.ebuild webmo-6.1.010.ebuild ChangeLog
Date: Tue, 05 Feb 2008 08:47:34
Message-Id: E1JMJSl-0001Kb-V3@stork.gentoo.org
1 hollow 08/02/05 08:47:31
2
3 Modified: webmo-7.0.003.ebuild webmo-6.1.010.ebuild ChangeLog
4 Log:
5 merge from webapps overlay wrt #208584
6 (Portage version: 2.1.4)
7
8 Revision Changes Path
9 1.3 sci-chemistry/webmo/webmo-7.0.003.ebuild
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/webmo/webmo-7.0.003.ebuild?rev=1.3&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/webmo/webmo-7.0.003.ebuild?rev=1.3&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/webmo/webmo-7.0.003.ebuild?r1=1.2&r2=1.3
14
15 Index: webmo-7.0.003.ebuild
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/webmo/webmo-7.0.003.ebuild,v
18 retrieving revision 1.2
19 retrieving revision 1.3
20 diff -u -r1.2 -r1.3
21 --- webmo-7.0.003.ebuild 29 Jul 2007 17:07:47 -0000 1.2
22 +++ webmo-7.0.003.ebuild 5 Feb 2008 08:47:31 -0000 1.3
23 @@ -1,22 +1,23 @@
24 -# Copyright 1999-2007 Gentoo Foundation
25 +# Copyright 1999-2008 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/webmo/webmo-7.0.003.ebuild,v 1.2 2007/07/29 17:07:47 phreak Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/webmo/webmo-7.0.003.ebuild,v 1.3 2008/02/05 08:47:31 hollow Exp $
29
30 -inherit eutils webapp
31 +inherit eutils webapp depend.apache
32
33 MY_SRC_PN="WebMO"
34 MY_SRC_P="${MY_SRC_PN}.${PV}"
35 DESCRIPTION="Web-based interface to computational chemistry packages"
36 HOMEPAGE="http://webmo.net/"
37 SRC_URI="${MY_SRC_P}.tar.gz"
38 +
39 LICENSE="WebMO"
40 SLOT="${PVR}"
41 KEYWORDS="~x86"
42 RESTRICT="fetch"
43 IUSE=""
44 -RDEPEND="dev-lang/perl
45 - www-servers/apache"
46 -DEPEND="${RDEPEND}"
47 +
48 +DEPEND="dev-lang/perl"
49 +need_apache2
50
51 S="${WORKDIR}/${MY_SRC_PN}.install"
52
53 @@ -43,15 +44,15 @@
54 unpack ${A}
55
56 # Set up program locations to match where portage installs them
57 - epatch ${FILESDIR}/${PV}-gentoo-locations.patch
58 + epatch "${FILESDIR}"/${PV}-gentoo-locations.patch
59
60 # Add a data directory for gamess, because WebMO expects everything
61 # in one directory instead of FHS
62 # (Depends on gentoo-locations.patch)
63 - epatch ${FILESDIR}/add-gamess-data-directory.patch
64 + epatch "${FILESDIR}"/add-gamess-data-directory.patch
65
66 # Don't run diagnose.pl or ask about being root user
67 - epatch ${FILESDIR}/dont-be-interactive-or-diagnose.patch
68 + epatch "${FILESDIR}"/dont-be-interactive-or-diagnose.patch
69
70 # Make setup.conf
71 create_setup_conf
72 @@ -61,14 +62,14 @@
73 webapp_src_preinst
74
75 # Install everything
76 - perl setup.pl || die "Check ${S}/diagnose.html for errors"
77 + perl setup.pl || die "Check '${S}'/diagnose.html for errors"
78
79 # Get ${D} out of main config file
80 dosed "${MY_CGIBINDIR}/webmo/interfaces/globals.int"
81
82 - webapp_hook_script ${FILESDIR}/reconfig
83 + webapp_hook_script "${FILESDIR}"/reconfig
84
85 - local files=$(find ${D}${MY_HOSTROOTDIR}/webmo ${D}${MY_CGIBINDIR}/webmo/interfaces)
86 + local files=$(find "${D}"${MY_HOSTROOTDIR}/webmo "${D}"${MY_CGIBINDIR}/webmo/interfaces)
87 # Add the directories themselves
88 files="${files} ${MY_HOSTROOTDIR}/webmo ${MY_CGIBINDIR}/webmo/interfaces"
89 files=${files//${D}/}
90 @@ -88,12 +89,12 @@
91 }
92
93 pkg_postinst() {
94 - einfo
95 - einfo "Be sure that this line is uncommented in httpd.conf:"
96 - einfo "AddHandle cgi-scripts .cgi"
97 - einfo
98 - einfo "The diagnose.pl script can be run if WebMO doesn't work properly."
99 - einfo
100 + elog
101 + elog "Be sure that this line is uncommented in httpd.conf:"
102 + elog "AddHandle cgi-scripts .cgi"
103 + elog
104 + elog "The diagnose.pl script can be run if WebMO doesn't work properly."
105 + elog
106 ewarn "Be careful never to overwrite your user, group or job databases"
107 ewarn "when using etc-update after an upgrade."
108
109
110
111
112 1.4 sci-chemistry/webmo/webmo-6.1.010.ebuild
113
114 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/webmo/webmo-6.1.010.ebuild?rev=1.4&view=markup
115 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/webmo/webmo-6.1.010.ebuild?rev=1.4&content-type=text/plain
116 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/webmo/webmo-6.1.010.ebuild?r1=1.3&r2=1.4
117
118 Index: webmo-6.1.010.ebuild
119 ===================================================================
120 RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/webmo/webmo-6.1.010.ebuild,v
121 retrieving revision 1.3
122 retrieving revision 1.4
123 diff -u -r1.3 -r1.4
124 --- webmo-6.1.010.ebuild 29 Jul 2007 17:07:47 -0000 1.3
125 +++ webmo-6.1.010.ebuild 5 Feb 2008 08:47:31 -0000 1.4
126 @@ -1,22 +1,23 @@
127 -# Copyright 1999-2007 Gentoo Foundation
128 +# Copyright 1999-2008 Gentoo Foundation
129 # Distributed under the terms of the GNU General Public License v2
130 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/webmo/webmo-6.1.010.ebuild,v 1.3 2007/07/29 17:07:47 phreak Exp $
131 +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/webmo/webmo-6.1.010.ebuild,v 1.4 2008/02/05 08:47:31 hollow Exp $
132
133 -inherit eutils webapp
134 +inherit eutils webapp depend.apache
135
136 MY_SRC_PN="WebMO"
137 MY_SRC_P="${MY_SRC_PN}.${PV}"
138 DESCRIPTION="Web-based interface to computational chemistry packages"
139 HOMEPAGE="http://webmo.net/"
140 SRC_URI="${MY_SRC_P}.tar.gz"
141 +
142 LICENSE="WebMO"
143 SLOT="${PVR}"
144 KEYWORDS="~x86"
145 RESTRICT="fetch"
146 IUSE=""
147 -RDEPEND="dev-lang/perl
148 - www-servers/apache"
149 -DEPEND="${RDEPEND}"
150 +
151 +DEPEND="dev-lang/perl"
152 +need_apache2
153
154 S="${WORKDIR}/${MY_SRC_PN}.install"
155
156 @@ -43,15 +44,15 @@
157 unpack ${A}
158
159 # Set up program locations to match where portage installs them
160 - epatch ${FILESDIR}/gentoo-locations.patch
161 + epatch "${FILESDIR}"/gentoo-locations.patch
162
163 # Add a data directory for gamess, because WebMO expects everything
164 # in one directory instead of FHS
165 # (Depends on gentoo-locations.patch)
166 - epatch ${FILESDIR}/add-gamess-data-directory.patch
167 + epatch "${FILESDIR}"/add-gamess-data-directory.patch
168
169 # Don't run diagnose.pl or ask about being root user
170 - epatch ${FILESDIR}/dont-be-interactive-or-diagnose.patch
171 + epatch "${FILESDIR}"/dont-be-interactive-or-diagnose.patch
172
173 # Make setup.conf
174 create_setup_conf
175 @@ -61,14 +62,14 @@
176 webapp_src_preinst
177
178 # Install everything
179 - perl setup.pl || die "Check ${S}/diagnose.html for errors"
180 + perl setup.pl || die "Check '${S}'/diagnose.html for errors"
181
182 # Get ${D} out of main config file
183 dosed "${MY_CGIBINDIR}/webmo/interfaces/globals.int"
184
185 - webapp_hook_script ${FILESDIR}/reconfig
186 + webapp_hook_script "${FILESDIR}"/reconfig
187
188 - local files=$(find ${D}${MY_HOSTROOTDIR}/webmo ${D}${MY_CGIBINDIR}/webmo/interfaces)
189 + local files=$(find "${D}"${MY_HOSTROOTDIR}/webmo "${D}"${MY_CGIBINDIR}/webmo/interfaces)
190 # Add the directories themselves
191 files="${files} ${MY_HOSTROOTDIR}/webmo ${MY_CGIBINDIR}/webmo/interfaces"
192 files=${files//${D}/}
193 @@ -88,12 +89,12 @@
194 }
195
196 pkg_postinst() {
197 - einfo
198 - einfo "Be sure that this line is uncommented in httpd.conf:"
199 - einfo "AddHandle cgi-scripts .cgi"
200 - einfo
201 - einfo "The diagnose.pl script can be run if WebMO doesn't work properly."
202 - einfo
203 + elog
204 + elog "Be sure that this line is uncommented in httpd.conf:"
205 + elog "AddHandle cgi-scripts .cgi"
206 + elog
207 + elog "The diagnose.pl script can be run if WebMO doesn't work properly."
208 + elog
209 ewarn "Be careful never to overwrite your user, group or job databases"
210 ewarn "when using etc-update after an upgrade."
211
212
213
214
215 1.14 sci-chemistry/webmo/ChangeLog
216
217 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/webmo/ChangeLog?rev=1.14&view=markup
218 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/webmo/ChangeLog?rev=1.14&content-type=text/plain
219 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/webmo/ChangeLog?r1=1.13&r2=1.14
220
221 Index: ChangeLog
222 ===================================================================
223 RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/webmo/ChangeLog,v
224 retrieving revision 1.13
225 retrieving revision 1.14
226 diff -u -r1.13 -r1.14
227 --- ChangeLog 29 Jul 2007 17:07:47 -0000 1.13
228 +++ ChangeLog 5 Feb 2008 08:47:31 -0000 1.14
229 @@ -1,6 +1,14 @@
230 # ChangeLog for sci-chemistry/webmo
231 -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
232 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/webmo/ChangeLog,v 1.13 2007/07/29 17:07:47 phreak Exp $
233 +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
234 +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/webmo/ChangeLog,v 1.14 2008/02/05 08:47:31 hollow Exp $
235 +
236 + 05 Feb 2008; Benedikt Böhm <hollow@g.o> webmo-6.1.010.ebuild,
237 + webmo-7.0.003.ebuild:
238 + merge from webapps overlay wrt #208584
239 +
240 + 03 Feb 2008; Jakub Moc <jakub@g.o> webmo-6.1.010.ebuild,
241 + webmo-7.0.003.ebuild:
242 + Fix apache dependencies wrt Bug 208584; fix quoting, einfo -> elog
243
244 29 Jul 2007; Christian Heim <phreak@g.o> webmo-6.1.010.ebuild,
245 webmo-7.0.003.ebuild:
246
247
248
249 --
250 gentoo-commits@l.g.o mailing list
Report Message
Find on MARC Find on Google Groups