1 |
nelchael 09/05/03 15:11:04 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: resin-3.2.1-r2.ebuild |
5 |
Removed: resin-3.2.1-r1.ebuild |
6 |
Log: |
7 |
Revision bump, use latest set of patches including patch for boot classpath. |
8 |
(Portage version: 2.1.6.12/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.87 www-servers/resin/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/ChangeLog?rev=1.87&view=markup |
14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/ChangeLog?rev=1.87&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/ChangeLog?r1=1.86&r2=1.87 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v |
20 |
retrieving revision 1.86 |
21 |
retrieving revision 1.87 |
22 |
diff -u -r1.86 -r1.87 |
23 |
--- ChangeLog 1 May 2009 22:40:16 -0000 1.86 |
24 |
+++ ChangeLog 3 May 2009 15:11:04 -0000 1.87 |
25 |
@@ -1,6 +1,13 @@ |
26 |
# ChangeLog for www-servers/resin |
27 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.86 2009/05/01 22:40:16 nelchael Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.87 2009/05/03 15:11:04 nelchael Exp $ |
30 |
+ |
31 |
+*resin-3.2.1-r2 (03 May 2009) |
32 |
+ |
33 |
+ 03 May 2009; Krzysiek Pawlik <nelchael@g.o> -resin-3.2.1-r1.ebuild, |
34 |
+ +resin-3.2.1-r2.ebuild: |
35 |
+ Revision bump, use latest set of patches including patch for boot |
36 |
+ classpath. |
37 |
|
38 |
*resin-3.2.1-r1 (01 May 2009) |
39 |
|
40 |
|
41 |
|
42 |
|
43 |
1.1 www-servers/resin/resin-3.2.1-r2.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/resin-3.2.1-r2.ebuild?rev=1.1&view=markup |
46 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/resin-3.2.1-r2.ebuild?rev=1.1&content-type=text/plain |
47 |
|
48 |
Index: resin-3.2.1-r2.ebuild |
49 |
=================================================================== |
50 |
# Copyright 1999-2009 Gentoo Foundation |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.2.1-r2.ebuild,v 1.1 2009/05/03 15:11:04 nelchael Exp $ |
53 |
|
54 |
EAPI="2" |
55 |
|
56 |
JAVA_PKG_IUSE="doc source" |
57 |
|
58 |
inherit java-pkg-2 java-ant-2 eutils flag-o-matic multilib autotools |
59 |
|
60 |
DESCRIPTION="A fast Servlet 2.5 and JSP 2.0 engine." |
61 |
HOMEPAGE="http://www.caucho.com" |
62 |
SRC_URI="http://www.caucho.com/download/${P}-src.zip |
63 |
mirror://gentoo/resin-gentoo-patches-${PV}-r1.tar.bz2" |
64 |
LICENSE="GPL-2" |
65 |
SLOT="0" |
66 |
IUSE="admin" |
67 |
|
68 |
KEYWORDS="~amd64 ~ppc ~x86" |
69 |
|
70 |
## java-virtuals/jaf" |
71 |
COMMON_DEP="~dev-java/resin-servlet-api-${PV} |
72 |
=dev-java/sun-j2ee-deployment-bin-1.1* |
73 |
java-virtuals/javamail" |
74 |
|
75 |
RDEPEND=">=virtual/jdk-1.5 |
76 |
${COMMON_DEP}" |
77 |
DEPEND=">=virtual/jdk-1.5 |
78 |
app-arch/unzip |
79 |
dev-java/ant-core |
80 |
dev-libs/openssl |
81 |
${COMMON_DEP}" |
82 |
|
83 |
RESIN_HOME="/usr/$(get_libdir)/resin" |
84 |
|
85 |
# Rewrites build.xml in documentation |
86 |
JAVA_PKG_BSFIX="off" |
87 |
|
88 |
pkg_setup() { |
89 |
|
90 |
java-pkg-2_pkg_setup |
91 |
enewgroup resin |
92 |
enewuser resin -1 /bin/bash ${RESIN_HOME} resin |
93 |
|
94 |
} |
95 |
|
96 |
src_unpack() { |
97 |
|
98 |
unpack ${A} |
99 |
for i in "${WORKDIR}"/${PV}/resin-${PV}-*; do |
100 |
epatch "${i}" |
101 |
done; |
102 |
|
103 |
java-ant_bsfix_one "${S}/build.xml" |
104 |
java-ant_bsfix_one "${S}/build-common.xml" |
105 |
|
106 |
sed -i -e 's/256m/384m/' "${S}/build.xml" |
107 |
|
108 |
cd "${S}" |
109 |
eautoreconf |
110 |
|
111 |
} |
112 |
|
113 |
src_configure() { |
114 |
|
115 |
append-flags -fPIC -DPIC |
116 |
|
117 |
chmod 755 "${S}/configure" |
118 |
econf --prefix=${RESIN_HOME} || die "econf failed" |
119 |
|
120 |
} |
121 |
|
122 |
src_compile() { |
123 |
|
124 |
einfo "Building libraries..." |
125 |
# Broken with -jn where n > 1 |
126 |
emake -j1 || die "emake failed" |
127 |
|
128 |
mkdir "${S}/lib" |
129 |
cd "${S}/lib" |
130 |
# java-pkg_jar-from --virtual jaf |
131 |
java-pkg_jar-from --virtual javamail |
132 |
# java-pkg_jar-from iso-relax |
133 |
# java-pkg_jar-from aopalliance-1 |
134 |
java-pkg_jar-from sun-j2ee-deployment-bin-1.1 |
135 |
java-pkg_jar-from resin-servlet-api-2.5 |
136 |
ln -s $(java-config --jdk-home)/lib/tools.jar |
137 |
cd "${S}" |
138 |
|
139 |
einfo "Building jars..." |
140 |
eant || die "ant failed" |
141 |
|
142 |
if use doc; then |
143 |
einfo "Building docs..." |
144 |
eant doc || die "ant doc failed" |
145 |
fi |
146 |
|
147 |
} |
148 |
|
149 |
src_install() { |
150 |
|
151 |
make DESTDIR="${D}" install || die |
152 |
|
153 |
dodir /etc/ |
154 |
mv "${D}/${RESIN_HOME}/conf" "${D}/etc/resin" || die "mv of conf failed" |
155 |
dosym /etc/resin ${RESIN_HOME}/conf |
156 |
|
157 |
keepdir /var/log/resin |
158 |
keepdir /var/log/resin |
159 |
keepdir /var/run/resin |
160 |
|
161 |
dosym /var/log/resin ${RESIN_HOME}/logs |
162 |
dosym /var/log/resin ${RESIN_HOME}/log |
163 |
|
164 |
dodoc README "${S}"/conf/*.xml |
165 |
|
166 |
newinitd "${FILESDIR}/${PV}/resin.init" resin |
167 |
newconfd "${FILESDIR}/${PV}/resin.conf" resin |
168 |
|
169 |
sed -i -e "s,__RESIN_HOME__,${RESIN_HOME},g" "${D}/etc/init.d/resin" |
170 |
|
171 |
rm -f "${S}/lib/tools.jar" |
172 |
java-pkg_dojar "${S}"/lib/*.jar |
173 |
rm -fr "${D}/${RESIN_HOME}/lib" |
174 |
dosym /usr/share/resin/lib ${RESIN_HOME}/lib |
175 |
dosym /var/log/resin /usr/share/resin/log |
176 |
|
177 |
dodir /var/lib/resin/webapps |
178 |
mv "${D}"/${RESIN_HOME}/webapps/* "${D}/var/lib/resin/webapps" || \ |
179 |
die "mv of webapps failed" |
180 |
rm -rf "${D}/${RESIN_HOME}/webapps" |
181 |
dosym /var/lib/resin/webapps ${RESIN_HOME}/webapps |
182 |
|
183 |
use admin && { |
184 |
cp -a "${S}/doc/admin" "${D}/var/lib/resin/webapps/" || die "cp failed" |
185 |
} |
186 |
|
187 |
use source && { |
188 |
einfo "Zipping source..." |
189 |
java-pkg_dosrc "${S}"/modules/*/src/* 2> /dev/null |
190 |
} |
191 |
|
192 |
einfo "Removing unneeded files..." |
193 |
rm -fr "${D}/${RESIN_HOME}/bin" |
194 |
rm -fr "${D}/${RESIN_HOME}/doc" |
195 |
rm -f "${D}"/etc/resin/*.orig |
196 |
|
197 |
einfo "Fixing permissions..." |
198 |
chown -R resin:resin "${D}${RESIN_HOME}" |
199 |
chown -R resin:resin "${D}/etc/resin" |
200 |
chown -R resin:resin "${D}/var/log/resin" |
201 |
chown -R resin:resin "${D}/var/lib/resin" |
202 |
chown -R resin:resin "${D}/var/run/resin" |
203 |
|
204 |
chmod 644 "${D}/etc/conf.d/resin" |
205 |
chmod 755 "${D}/etc/init.d/resin" |
206 |
chmod 750 "${D}/var/lib/resin" |
207 |
chmod 750 "${D}/var/run/resin" |
208 |
chmod 750 "${D}/etc/resin" |
209 |
|
210 |
} |
211 |
|
212 |
pkg_postinst() { |
213 |
|
214 |
elog |
215 |
elog " User and group 'resin' have been added." |
216 |
elog |
217 |
elog " By default, Resin runs on port 8080. You can change this" |
218 |
elog " value by editing /etc/resin/resin.xml." |
219 |
elog |
220 |
elog " webapps directory was moved to /var/lib/resin/webapps" |
221 |
elog |
222 |
elog " Most options has been moved from /etc/conf.d/resin to" |
223 |
elog " /etc/resin/resin.xml." |
224 |
elog |
225 |
|
226 |
} |