1 |
hollow 08/02/24 00:00:39 |
2 |
|
3 |
Modified: metadata.xml twiki-4.1.2.ebuild ChangeLog |
4 |
Added: twiki-4.2.0.ebuild |
5 |
Log: |
6 |
version bump, #209663; ebuild cleanup wrt #208584 |
7 |
(Portage version: 2.1.4.4) |
8 |
|
9 |
Revision Changes Path |
10 |
1.2 www-apps/twiki/metadata.xml |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/twiki/metadata.xml?rev=1.2&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/twiki/metadata.xml?rev=1.2&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/twiki/metadata.xml?r1=1.1&r2=1.2 |
15 |
|
16 |
Index: metadata.xml |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/www-apps/twiki/metadata.xml,v |
19 |
retrieving revision 1.1 |
20 |
retrieving revision 1.2 |
21 |
diff -u -r1.1 -r1.2 |
22 |
--- metadata.xml 15 Aug 2004 15:49:56 -0000 1.1 |
23 |
+++ metadata.xml 24 Feb 2008 00:00:38 -0000 1.2 |
24 |
@@ -1,9 +1,5 @@ |
25 |
<?xml version="1.0" encoding="UTF-8"?> |
26 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
27 |
<pkgmetadata> |
28 |
-<herd>web-apps</herd> |
29 |
-<maintainer> |
30 |
-<email>web-apps@g.o</email> |
31 |
-<name>Gentoo Web Application Packages Maintainers</name> |
32 |
-</maintainer> |
33 |
+ <herd>web-apps</herd> |
34 |
</pkgmetadata> |
35 |
|
36 |
|
37 |
|
38 |
1.2 www-apps/twiki/twiki-4.1.2.ebuild |
39 |
|
40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/twiki/twiki-4.1.2.ebuild?rev=1.2&view=markup |
41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/twiki/twiki-4.1.2.ebuild?rev=1.2&content-type=text/plain |
42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/twiki/twiki-4.1.2.ebuild?r1=1.1&r2=1.2 |
43 |
|
44 |
Index: twiki-4.1.2.ebuild |
45 |
=================================================================== |
46 |
RCS file: /var/cvsroot/gentoo-x86/www-apps/twiki/twiki-4.1.2.ebuild,v |
47 |
retrieving revision 1.1 |
48 |
retrieving revision 1.2 |
49 |
diff -u -r1.1 -r1.2 |
50 |
--- twiki-4.1.2.ebuild 26 May 2007 21:48:05 -0000 1.1 |
51 |
+++ twiki-4.1.2.ebuild 24 Feb 2008 00:00:38 -0000 1.2 |
52 |
@@ -1,8 +1,10 @@ |
53 |
-# Copyright 1999-2007 Gentoo Foundation |
54 |
+# Copyright 1999-2008 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/www-apps/twiki/twiki-4.1.2.ebuild,v 1.1 2007/05/26 21:48:05 rl03 Exp $ |
57 |
+# $Header: /var/cvsroot/gentoo-x86/www-apps/twiki/twiki-4.1.2.ebuild,v 1.2 2008/02/24 00:00:38 hollow Exp $ |
58 |
|
59 |
-inherit webapp eutils depend.apache |
60 |
+WEBAPP_NO_AUTO_INSTALL="yes" |
61 |
+ |
62 |
+inherit webapp |
63 |
|
64 |
MY_PN="TWiki" |
65 |
|
66 |
@@ -14,56 +16,50 @@ |
67 |
KEYWORDS="~amd64 ~ppc ~sparc ~x86" |
68 |
IUSE="" |
69 |
|
70 |
-S=${WORKDIR} |
71 |
+S="${WORKDIR}" |
72 |
|
73 |
-RDEPEND=">=dev-lang/perl-5.8 |
74 |
- >=app-text/rcs-5.7 |
75 |
- sys-apps/diffutils |
76 |
- dev-perl/Algorithm-Diff |
77 |
- >=virtual/perl-CGI-3.20 |
78 |
- virtual/perl-File-Spec |
79 |
- dev-perl/Text-Diff |
80 |
- virtual/perl-Time-Local |
81 |
- dev-perl/CGI-Session |
82 |
- virtual/perl-digest-base |
83 |
- dev-perl/Digest-SHA1 |
84 |
- dev-perl/locale-maketext-lexicon |
85 |
- virtual/perl-libnet |
86 |
- dev-perl/URI |
87 |
- virtual/cron |
88 |
- dev-perl/HTML-Parser |
89 |
-" |
90 |
- |
91 |
-want_apache |
92 |
- |
93 |
-src_unpack() { |
94 |
- unpack ${A} |
95 |
- cd ${S} |
96 |
- |
97 |
- mv ${S}/bin/LocalLib.cfg.txt ${S}/bin/LocalLib.cfg |
98 |
- # change web user to apache |
99 |
- cd ${S}/lib/TWiki |
100 |
- find . -name '*,v' -exec sed -i 's|nobody:|apache:|g' '{}' ';' |
101 |
-} |
102 |
+RDEPEND=">=app-text/rcs-5.7 |
103 |
+ sys-apps/diffutils |
104 |
+ >=dev-lang/perl-5.8 |
105 |
+ dev-perl/Algorithm-Diff |
106 |
+ dev-perl/CGI-Session |
107 |
+ dev-perl/Digest-SHA1 |
108 |
+ dev-perl/HTML-Parser |
109 |
+ dev-perl/locale-maketext-lexicon |
110 |
+ dev-perl/Text-Diff |
111 |
+ dev-perl/URI |
112 |
+ virtual/cron |
113 |
+ >=virtual/perl-CGI-3.20 |
114 |
+ virtual/perl-digest-base |
115 |
+ virtual/perl-File-Spec |
116 |
+ virtual/perl-libnet |
117 |
+ virtual/perl-Time-Local" |
118 |
+ |
119 |
+need_httpd_cgi |
120 |
|
121 |
src_install() { |
122 |
webapp_src_preinst |
123 |
|
124 |
- cp -r . ${D}/${MY_HTDOCSDIR} |
125 |
- |
126 |
- dodoc readme.txt |
127 |
+ dodoc AUTHORS COPYRIGHT readme.txt |
128 |
dohtml T*.html INSTALL.html |
129 |
+ rm -f readme.txt T*.html INSTALL.html |
130 |
|
131 |
- for file in $(find data pub) ; do |
132 |
- webapp_serverowned "${MY_HTDOCSDIR}/${file}" |
133 |
+ mv bin/LocalLib.cfg{.txt,} |
134 |
+ |
135 |
+ insinto "${MY_HTDOCSDIR}" |
136 |
+ doins -r . |
137 |
+ |
138 |
+ for f in $(find data pub); do |
139 |
+ webapp_serverowned "${MY_HTDOCSDIR}"/${f} |
140 |
done |
141 |
|
142 |
- for a in bin/setlib.cfg bin/LocalLib.cfg ; do |
143 |
- webapp_configfile ${MY_HTDOCSDIR}/${a} |
144 |
+ for f in bin/setlib.cfg bin/LocalLib.cfg; do |
145 |
+ webapp_configfile "${MY_HTDOCSDIR}"/${f} |
146 |
done |
147 |
- webapp_hook_script ${FILESDIR}/reconfig |
148 |
- webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt |
149 |
- webapp_postupgrade_txt en ${FILESDIR}/postupgrade-en.txt |
150 |
+ |
151 |
+ webapp_hook_script "${FILESDIR}"/reconfig |
152 |
+ webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt |
153 |
+ webapp_postupgrade_txt en "${FILESDIR}"/postupgrade-en.txt |
154 |
|
155 |
webapp_src_install |
156 |
} |
157 |
@@ -76,8 +72,5 @@ |
158 |
ewarn "You are _strongly_ encouraged to to read the upgrade guide:" |
159 |
ewarn "http://twiki.org/cgi-bin/view/TWiki/TWikiDocumentation" |
160 |
ewarn |
161 |
- elog "webapp-config will not be run automatically" |
162 |
- elog "Run webapp-config -I -h <host> -d ${PN} ${PN} ${PVR} to install" |
163 |
- elog |
164 |
- # webapp_pkg_postinst |
165 |
+ webapp_pkg_postinst |
166 |
} |
167 |
|
168 |
|
169 |
|
170 |
1.43 www-apps/twiki/ChangeLog |
171 |
|
172 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/twiki/ChangeLog?rev=1.43&view=markup |
173 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/twiki/ChangeLog?rev=1.43&content-type=text/plain |
174 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/twiki/ChangeLog?r1=1.42&r2=1.43 |
175 |
|
176 |
Index: ChangeLog |
177 |
=================================================================== |
178 |
RCS file: /var/cvsroot/gentoo-x86/www-apps/twiki/ChangeLog,v |
179 |
retrieving revision 1.42 |
180 |
retrieving revision 1.43 |
181 |
diff -u -r1.42 -r1.43 |
182 |
--- ChangeLog 26 May 2007 21:48:05 -0000 1.42 |
183 |
+++ ChangeLog 24 Feb 2008 00:00:38 -0000 1.43 |
184 |
@@ -1,6 +1,12 @@ |
185 |
# ChangeLog for www-apps/twiki |
186 |
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 |
187 |
-# $Header: /var/cvsroot/gentoo-x86/www-apps/twiki/ChangeLog,v 1.42 2007/05/26 21:48:05 rl03 Exp $ |
188 |
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 |
189 |
+# $Header: /var/cvsroot/gentoo-x86/www-apps/twiki/ChangeLog,v 1.43 2008/02/24 00:00:38 hollow Exp $ |
190 |
+ |
191 |
+*twiki-4.2.0 (24 Feb 2008) |
192 |
+ |
193 |
+ 24 Feb 2008; Benedikt Böhm <hollow@g.o> metadata.xml, |
194 |
+ twiki-4.1.2.ebuild, +twiki-4.2.0.ebuild: |
195 |
+ version bump, #209663; ebuild cleanup wrt #208584 |
196 |
|
197 |
*twiki-4.1.2 (26 May 2007) |
198 |
|
199 |
|
200 |
|
201 |
|
202 |
1.1 www-apps/twiki/twiki-4.2.0.ebuild |
203 |
|
204 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/twiki/twiki-4.2.0.ebuild?rev=1.1&view=markup |
205 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apps/twiki/twiki-4.2.0.ebuild?rev=1.1&content-type=text/plain |
206 |
|
207 |
Index: twiki-4.2.0.ebuild |
208 |
=================================================================== |
209 |
# Copyright 1999-2008 Gentoo Foundation |
210 |
# Distributed under the terms of the GNU General Public License v2 |
211 |
# $Header: /var/cvsroot/gentoo-x86/www-apps/twiki/twiki-4.2.0.ebuild,v 1.1 2008/02/24 00:00:38 hollow Exp $ |
212 |
|
213 |
WEBAPP_NO_AUTO_INSTALL="yes" |
214 |
|
215 |
inherit webapp |
216 |
|
217 |
MY_PN="TWiki" |
218 |
|
219 |
DESCRIPTION="A Web Based Collaboration Platform" |
220 |
HOMEPAGE="http://twiki.org/" |
221 |
SRC_URI="http://twiki.org/p/pub/Codev/Release/${MY_PN}-${PV}.tgz" |
222 |
|
223 |
LICENSE="GPL-2" |
224 |
KEYWORDS="~amd64 ~ppc ~sparc ~x86" |
225 |
IUSE="" |
226 |
|
227 |
S="${WORKDIR}" |
228 |
|
229 |
RDEPEND=">=app-text/rcs-5.7 |
230 |
sys-apps/diffutils |
231 |
>=dev-lang/perl-5.8 |
232 |
dev-perl/Algorithm-Diff |
233 |
dev-perl/CGI-Session |
234 |
dev-perl/Digest-SHA1 |
235 |
dev-perl/HTML-Parser |
236 |
dev-perl/locale-maketext-lexicon |
237 |
dev-perl/Text-Diff |
238 |
dev-perl/URI |
239 |
virtual/cron |
240 |
>=virtual/perl-CGI-3.20 |
241 |
virtual/perl-digest-base |
242 |
virtual/perl-File-Spec |
243 |
virtual/perl-libnet |
244 |
virtual/perl-Time-Local" |
245 |
|
246 |
need_httpd_cgi |
247 |
|
248 |
src_install() { |
249 |
webapp_src_preinst |
250 |
|
251 |
dodoc AUTHORS COPYRIGHT readme.txt |
252 |
dohtml T*.html INSTALL.html |
253 |
rm -f readme.txt T*.html INSTALL.html |
254 |
|
255 |
mv bin/LocalLib.cfg{.txt,} |
256 |
|
257 |
insinto "${MY_HTDOCSDIR}" |
258 |
doins -r . |
259 |
|
260 |
for f in $(find data pub); do |
261 |
webapp_serverowned "${MY_HTDOCSDIR}"/${f} |
262 |
done |
263 |
|
264 |
for f in bin/setlib.cfg bin/LocalLib.cfg; do |
265 |
webapp_configfile "${MY_HTDOCSDIR}"/${f} |
266 |
done |
267 |
|
268 |
webapp_hook_script "${FILESDIR}"/reconfig |
269 |
webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt |
270 |
webapp_postupgrade_txt en "${FILESDIR}"/postupgrade-en.txt |
271 |
|
272 |
webapp_src_install |
273 |
} |
274 |
|
275 |
pkg_postinst() { |
276 |
ewarn |
277 |
ewarn "If you are upgrading from an older version of TWiki, back up your" |
278 |
ewarn "data/ and pub/ directories and any local changes before upgrading!" |
279 |
ewarn |
280 |
ewarn "You are _strongly_ encouraged to to read the upgrade guide:" |
281 |
ewarn "http://twiki.org/cgi-bin/view/TWiki/TWikiDocumentation" |
282 |
ewarn |
283 |
webapp_pkg_postinst |
284 |
} |
285 |
|
286 |
|
287 |
|
288 |
-- |
289 |
gentoo-commits@l.g.o mailing list |