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

Gentoo Archives: gentoo-commits

From: "Krzysztof Pawlik (nelchael)" <nelchael@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-servers/resin: ChangeLog resin-4.0.22.ebuild
Date: Tue, 06 Sep 2011 16:46:25
Message-Id: 20110906164605.F393C20051@flycatcher.gentoo.org
1 nelchael 11/09/06 16:46:05
2
3 Modified: ChangeLog
4 Added: resin-4.0.22.ebuild
5 Log:
6 Version bump.
7
8 (Portage version: 2.1.10.13/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.108 www-servers/resin/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/resin/ChangeLog?rev=1.108&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/resin/ChangeLog?rev=1.108&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/resin/ChangeLog?r1=1.107&r2=1.108
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v
20 retrieving revision 1.107
21 retrieving revision 1.108
22 diff -u -r1.107 -r1.108
23 --- ChangeLog 15 Mar 2011 20:12:40 -0000 1.107
24 +++ ChangeLog 6 Sep 2011 16:46:05 -0000 1.108
25 @@ -1,6 +1,12 @@
26 # ChangeLog for www-servers/resin
27 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.107 2011/03/15 20:12:40 nelchael Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.108 2011/09/06 16:46:05 nelchael Exp $
30 +
31 +*resin-4.0.22 (06 Sep 2011)
32 +
33 + 06 Sep 2011; Krzysztof Pawlik <nelchael@g.o> +files/4.0.22/resin.conf,
34 + +files/4.0.22/resin.init, +resin-4.0.22.ebuild:
35 + Version bump.
36
37 *resin-4.0.15 (15 Mar 2011)
38
39
40
41
42 1.1 www-servers/resin/resin-4.0.22.ebuild
43
44 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/resin/resin-4.0.22.ebuild?rev=1.1&view=markup
45 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/resin/resin-4.0.22.ebuild?rev=1.1&content-type=text/plain
46
47 Index: resin-4.0.22.ebuild
48 ===================================================================
49 # Copyright 1999-2011 Gentoo Foundation
50 # Distributed under the terms of the GNU General Public License v2
51 # $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-4.0.22.ebuild,v 1.1 2011/09/06 16:46:05 nelchael Exp $
52
53 EAPI="2"
54
55 JAVA_PKG_IUSE="source"
56
57 inherit java-pkg-2 java-ant-2 eutils flag-o-matic multilib autotools
58
59 DESCRIPTION="A fast Servlet and JSP engine."
60 HOMEPAGE="http://www.caucho.com"
61 SRC_URI="http://www.caucho.com/download/${P}-src.zip
62 mirror://gentoo/resin-gentoo-patches-${PV}.tar.bz2"
63 LICENSE="GPL-2"
64 SLOT="0"
65 IUSE="admin doc"
66
67 KEYWORDS="~amd64 ~x86"
68
69 COMMON_DEP="~dev-java/resin-servlet-api-${PV}
70 dev-java/glassfish-deployment-api:1.2
71 java-virtuals/javamail
72 dev-java/jsr101
73 dev-java/mojarra:1.2
74 dev-java/validation-api:1.0"
75
76 RDEPEND=">=virtual/jdk-1.5
77 ${COMMON_DEP}"
78 DEPEND=">=virtual/jdk-1.5
79 app-arch/unzip
80 dev-java/ant-core
81 dev-libs/openssl
82 ${COMMON_DEP}"
83
84 RESIN_HOME="/usr/$(get_libdir)/resin"
85
86 # Rewrites build.xml in documentation
87 JAVA_PKG_BSFIX="off"
88
89 pkg_setup() {
90 java-pkg-2_pkg_setup
91 enewgroup resin
92 enewuser resin -1 /bin/bash ${RESIN_HOME} resin
93 }
94
95 src_prepare() {
96 for i in "${WORKDIR}"/${PV}/resin-${PV}-*; do
97 epatch "${i}"
98 done;
99
100 # Respect LDFLAGS:
101 sed -i -e 's/-o/$(LDFLAGS) -o/' modules/c/src/resin_os/Makefile.in
102
103 # No bundled JARs!
104 rm -f "${S}/modules/ext/"*.jar
105 rm -rf "${S}/project-jars"
106
107 java-ant_bsfix_one "${S}/build.xml"
108 java-ant_bsfix_one "${S}/build-common.xml"
109
110 mkdir -p "${S}/m4"
111 eautoreconf
112
113 # Symlink our libraries:
114 mkdir -p "${S}/gentoo-deps"
115 cd "${S}/gentoo-deps/"
116 java-pkg_jar-from --virtual javamail
117 java-pkg_jar-from glassfish-deployment-api-1.2
118 java-pkg_jar-from resin-servlet-api-3.0 resin-servlet-api.jar
119 java-pkg_jar-from mojarra-1.2
120 java-pkg_jar-from jsr101
121 java-pkg_jar-from validation-api-1.0
122 ln -s $(java-config --jdk-home)/lib/tools.jar
123 }
124
125 src_configure() {
126 append-flags -fPIC -DPIC
127
128 chmod 755 "${S}/configure"
129 econf --prefix=${RESIN_HOME} || die "econf failed"
130 }
131
132 src_compile() {
133 einfo "Building libraries..."
134 emake || die "make failed"
135
136 einfo "Building jars..."
137 eant || die "ant failed"
138 }
139
140 src_install() {
141 emake DESTDIR="${D}" install || die "Install failed"
142
143 einfo "Moving configuration to /etc ..."
144 dodir /etc/
145 mv "${D}/${RESIN_HOME}/conf" "${D}/etc/resin" || die "mv of conf failed"
146 dosym /etc/resin ${RESIN_HOME}/conf
147
148 einfo "Rewriting resin.xml ..."
149 sed -i \
150 -e 's,${resin.root}/doc/resin-doc,webapps/resin-doc,' \
151 -e 's,${resin.root}/doc/admin,webapps/admin,' \
152 "${D}/etc/resin/resin.xml"
153
154 einfo "Fixing log directory ..."
155 rm -rf "${D}/${RESIN_HOME}/log"
156 keepdir /var/log/resin
157 dosym /var/log/resin ${RESIN_HOME}/log
158
159 einfo "Installing basic documentation ..."
160 dodoc README "${S}"/conf/*.xml
161
162 einfo "Installing init.d script ..."
163 newinitd "${FILESDIR}/${PV}/resin.init" resin
164 newconfd "${FILESDIR}/${PV}/resin.conf" resin
165
166 sed -i -e "s,__RESIN_HOME__,${RESIN_HOME},g" "${D}/etc/init.d/resin"
167
168 einfo "Fixing location of jars ..."
169 rm -f "${S}/lib/tools.jar"
170 java-pkg_dojar "${S}"/lib/*.jar
171 rm -fr "${D}/${RESIN_HOME}/lib"
172 dosym /usr/share/resin/lib ${RESIN_HOME}/lib
173
174 einfo "Symlinking directories from /var/lib/resin ..."
175 rm -rf "${D}/${RESIN_HOME}/resin-data"
176 rm -rf "${D}/${RESIN_HOME}/watchdog-data"
177 dodir /var/lib/resin/webapps
178 keepdir /var/lib/resin/hosts
179 keepdir /var/lib/resin/resin-data
180 keepdir /var/lib/resin/watchdog-data
181 mv "${D}"/${RESIN_HOME}/webapps/* "${D}/var/lib/resin/webapps" || \
182 die "mv of webapps failed"
183 rm -rf "${D}/${RESIN_HOME}/webapps"
184 dosym /var/lib/resin/webapps ${RESIN_HOME}/webapps
185 dosym /var/lib/resin/hosts ${RESIN_HOME}/hosts
186 dosym /var/lib/resin/resin-data ${RESIN_HOME}/resin-data
187 dosym /var/lib/resin/watchdog-data ${RESIN_HOME}/watchdog-data
188
189 dosym \
190 "$(java-pkg_getjar resin-servlet-api-3.0 resin-servlet-api.jar)" \
191 "${JAVA_PKG_JARDEST}/resin-servlet-api.jar" || die
192
193 use admin && {
194 einfo "Installing administration app ..."
195 cp -a "${S}/doc/admin" "${D}/var/lib/resin/webapps/" || die
196 }
197 use doc && {
198 einfo "Installing documentation app ..."
199 cp -a "${S}/doc/resin-doc" "${D}/var/lib/resin/webapps/" || die
200 }
201
202 use source && {
203 einfo "Installing sources ..."
204 java-pkg_dosrc "${S}"/modules/*/src/* > /dev/null
205 }
206
207 einfo "Removing stale directories ..."
208 rm -fr "${D}/${RESIN_HOME}/bin"
209 rm -fr "${D}/${RESIN_HOME}/doc"
210 rm -fr "${D}/${RESIN_HOME}/keys"
211 rm -fr "${D}/${RESIN_HOME}/licenses"
212 rm -fr "${D}/etc/resin/"*.orig
213
214 einfo "Fixing ownerships and permissions ..."
215 chown -R 0:root "${D}/"
216 chown -R resin:resin "${D}/etc/resin"
217 chown -R resin:resin "${D}/var/lib/resin"
218 chown -R resin:resin "${D}/var/log/resin"
219
220 chmod 644 "${D}/etc/conf.d/resin"
221 chmod 755 "${D}/etc/init.d/resin"
222 chmod 750 "${D}/var/lib/resin"
223 chmod 750 "${D}/etc/resin"
224 }
225
226 pkg_postinst() {
227 elog
228 elog " User and group 'resin' have been added."
229 elog
230 elog " By default, Resin runs on port 8080. You can change this"
231 elog " value by editing /etc/resin/resin.xml."
232 elog
233 }
Report Message
Find on MARC Find on Google Groups