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