1 |
nelchael 12/02/24 17:42:49 |
2 |
|
3 |
Modified: resin-4.0.25.ebuild ChangeLog |
4 |
Log: |
5 |
Update ebuild for EAPI 4. |
6 |
|
7 |
(Portage version: 2.1.10.47/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.3 www-servers/resin/resin-4.0.25.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/resin/resin-4.0.25.ebuild?rev=1.3&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/resin/resin-4.0.25.ebuild?rev=1.3&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/resin/resin-4.0.25.ebuild?r1=1.2&r2=1.3 |
15 |
|
16 |
Index: resin-4.0.25.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/www-servers/resin/resin-4.0.25.ebuild,v |
19 |
retrieving revision 1.2 |
20 |
retrieving revision 1.3 |
21 |
diff -u -r1.2 -r1.3 |
22 |
--- resin-4.0.25.ebuild 23 Feb 2012 22:45:06 -0000 1.2 |
23 |
+++ resin-4.0.25.ebuild 24 Feb 2012 17:42:49 -0000 1.3 |
24 |
@@ -1,8 +1,8 @@ |
25 |
# Copyright 1999-2012 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-4.0.25.ebuild,v 1.2 2012/02/23 22:45:06 nelchael Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-4.0.25.ebuild,v 1.3 2012/02/24 17:42:49 nelchael Exp $ |
29 |
|
30 |
-EAPI="2" |
31 |
+EAPI="4" |
32 |
|
33 |
JAVA_PKG_IUSE="source" |
34 |
|
35 |
@@ -50,34 +50,35 @@ |
36 |
done; |
37 |
|
38 |
# Respect LDFLAGS: |
39 |
- sed -i -e 's/-o/$(LDFLAGS) -o/' modules/c/src/resin_os/Makefile.in |
40 |
+ sed -i -e 's/-o/$(LDFLAGS) -o/' modules/c/src/resin_os/Makefile.in || die |
41 |
|
42 |
# No bundled JARs! |
43 |
- rm -f "${S}/modules/ext/"*.jar |
44 |
- rm -rf "${S}/project-jars" |
45 |
+ rm -f "${S}/modules/ext/"*.jar || die |
46 |
+ rm -rf "${S}/project-jars" || die |
47 |
|
48 |
java-ant_bsfix_one "${S}/build.xml" |
49 |
java-ant_bsfix_one "${S}/build-common.xml" |
50 |
|
51 |
- mkdir -p "${S}/m4" |
52 |
+ mkdir -p "${S}/m4" || die |
53 |
+ sed -i -e 's,-O2,,g' configure.ac || die |
54 |
eautoreconf |
55 |
|
56 |
# Symlink our libraries: |
57 |
- mkdir -p "${S}/gentoo-deps" |
58 |
- cd "${S}/gentoo-deps/" |
59 |
+ mkdir -p "${S}/gentoo-deps" || die |
60 |
+ cd "${S}/gentoo-deps/" || die |
61 |
java-pkg_jar-from --virtual javamail |
62 |
java-pkg_jar-from glassfish-deployment-api-1.2 |
63 |
java-pkg_jar-from resin-servlet-api-3.0 resin-servlet-api.jar |
64 |
java-pkg_jar-from mojarra-1.2 |
65 |
java-pkg_jar-from jsr101 |
66 |
java-pkg_jar-from validation-api-1.0 |
67 |
- ln -s $(java-config --jdk-home)/lib/tools.jar |
68 |
+ ln -s $(java-config --jdk-home)/lib/tools.jar || die |
69 |
} |
70 |
|
71 |
src_configure() { |
72 |
append-flags -fPIC -DPIC |
73 |
|
74 |
- chmod 755 "${S}/configure" |
75 |
+ chmod 755 "${S}/configure" || die |
76 |
econf --prefix=${RESIN_HOME} || die "econf failed" |
77 |
} |
78 |
|
79 |
@@ -101,10 +102,10 @@ |
80 |
sed -i \ |
81 |
-e 's,${resin.root}/doc/resin-doc,webapps/resin-doc,' \ |
82 |
-e 's,${resin.root}/doc/admin,webapps/admin,' \ |
83 |
- "${D}/etc/resin/resin.xml" |
84 |
+ "${D}/etc/resin/resin.xml" || die |
85 |
|
86 |
einfo "Fixing log directory ..." |
87 |
- rm -rf "${D}/${RESIN_HOME}/log" |
88 |
+ rm -rf "${D}/${RESIN_HOME}/log" || die |
89 |
keepdir /var/log/resin |
90 |
dosym /var/log/resin ${RESIN_HOME}/log |
91 |
|
92 |
@@ -115,24 +116,24 @@ |
93 |
newinitd "${FILESDIR}/${PV}/resin.init" resin |
94 |
newconfd "${FILESDIR}/${PV}/resin.conf" resin |
95 |
|
96 |
- sed -i -e "s,__RESIN_HOME__,${RESIN_HOME},g" "${D}/etc/init.d/resin" |
97 |
+ sed -i -e "s,__RESIN_HOME__,${RESIN_HOME},g" "${D}/etc/init.d/resin" || die |
98 |
|
99 |
einfo "Fixing location of jars ..." |
100 |
- rm -f "${S}/lib/tools.jar" |
101 |
+ rm -f "${S}/lib/tools.jar" || die |
102 |
java-pkg_dojar "${S}"/lib/*.jar |
103 |
- rm -fr "${D}/${RESIN_HOME}/lib" |
104 |
+ rm -fr "${D}/${RESIN_HOME}/lib" || die |
105 |
dosym /usr/share/resin/lib ${RESIN_HOME}/lib |
106 |
|
107 |
einfo "Symlinking directories from /var/lib/resin ..." |
108 |
- rm -rf "${D}/${RESIN_HOME}/resin-data" |
109 |
- rm -rf "${D}/${RESIN_HOME}/watchdog-data" |
110 |
+ rm -rf "${D}/${RESIN_HOME}/resin-data" || die |
111 |
+ rm -rf "${D}/${RESIN_HOME}/watchdog-data" || die |
112 |
dodir /var/lib/resin/webapps |
113 |
keepdir /var/lib/resin/hosts |
114 |
keepdir /var/lib/resin/resin-data |
115 |
keepdir /var/lib/resin/watchdog-data |
116 |
mv "${D}"/${RESIN_HOME}/webapps/* "${D}/var/lib/resin/webapps" || \ |
117 |
die "mv of webapps failed" |
118 |
- rm -rf "${D}/${RESIN_HOME}/webapps" |
119 |
+ rm -rf "${D}/${RESIN_HOME}/webapps" || die |
120 |
dosym /var/lib/resin/webapps ${RESIN_HOME}/webapps |
121 |
dosym /var/lib/resin/hosts ${RESIN_HOME}/hosts |
122 |
dosym /var/lib/resin/resin-data ${RESIN_HOME}/resin-data |
123 |
@@ -140,7 +141,7 @@ |
124 |
|
125 |
dosym \ |
126 |
"$(java-pkg_getjar resin-servlet-api-3.0 resin-servlet-api.jar)" \ |
127 |
- "${JAVA_PKG_JARDEST}/resin-servlet-api.jar" || die |
128 |
+ "${JAVA_PKG_JARDEST}/resin-servlet-api.jar" |
129 |
|
130 |
use admin && { |
131 |
einfo "Installing administration app ..." |
132 |
@@ -157,22 +158,22 @@ |
133 |
} |
134 |
|
135 |
einfo "Removing stale directories ..." |
136 |
- rm -fr "${D}/${RESIN_HOME}/bin" |
137 |
- rm -fr "${D}/${RESIN_HOME}/doc" |
138 |
- rm -fr "${D}/${RESIN_HOME}/keys" |
139 |
- rm -fr "${D}/${RESIN_HOME}/licenses" |
140 |
- rm -fr "${D}/etc/resin/"*.orig |
141 |
+ rm -fr "${D}/${RESIN_HOME}/bin" || die |
142 |
+ rm -fr "${D}/${RESIN_HOME}/doc" || die |
143 |
+ rm -fr "${D}/${RESIN_HOME}/keys" || die |
144 |
+ rm -fr "${D}/${RESIN_HOME}/licenses" || die |
145 |
+ rm -fr "${D}/etc/resin/"*.orig || die |
146 |
|
147 |
einfo "Fixing ownerships and permissions ..." |
148 |
- chown -R 0:root "${D}/" |
149 |
- chown -R resin:resin "${D}/etc/resin" |
150 |
- chown -R resin:resin "${D}/var/lib/resin" |
151 |
- chown -R resin:resin "${D}/var/log/resin" |
152 |
- |
153 |
- chmod 644 "${D}/etc/conf.d/resin" |
154 |
- chmod 755 "${D}/etc/init.d/resin" |
155 |
- chmod 750 "${D}/var/lib/resin" |
156 |
- chmod 750 "${D}/etc/resin" |
157 |
+ fowners -R 0:root / |
158 |
+ fowners -R resin:resin /etc/resin |
159 |
+ fowners -R resin:resin /var/lib/resin |
160 |
+ fowners -R resin:resin /var/log/resin |
161 |
+ |
162 |
+ fperms 644 /etc/conf.d/resin |
163 |
+ fperms 755 /etc/init.d/resin |
164 |
+ fperms 750 /var/lib/resin |
165 |
+ fperms 750 /etc/resin |
166 |
} |
167 |
|
168 |
pkg_postinst() { |
169 |
|
170 |
|
171 |
|
172 |
1.114 www-servers/resin/ChangeLog |
173 |
|
174 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/resin/ChangeLog?rev=1.114&view=markup |
175 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/resin/ChangeLog?rev=1.114&content-type=text/plain |
176 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/resin/ChangeLog?r1=1.113&r2=1.114 |
177 |
|
178 |
Index: ChangeLog |
179 |
=================================================================== |
180 |
RCS file: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v |
181 |
retrieving revision 1.113 |
182 |
retrieving revision 1.114 |
183 |
diff -u -r1.113 -r1.114 |
184 |
--- ChangeLog 24 Feb 2012 14:50:13 -0000 1.113 |
185 |
+++ ChangeLog 24 Feb 2012 17:42:49 -0000 1.114 |
186 |
@@ -1,6 +1,9 @@ |
187 |
# ChangeLog for www-servers/resin |
188 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
189 |
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.113 2012/02/24 14:50:13 nelchael Exp $ |
190 |
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.114 2012/02/24 17:42:49 nelchael Exp $ |
191 |
+ |
192 |
+ 24 Feb 2012; Krzysztof Pawlik <nelchael@g.o> resin-4.0.25.ebuild: |
193 |
+ Update ebuild for EAPI 4. |
194 |
|
195 |
24 Feb 2012; Krzysztof Pawlik <nelchael@g.o> resin-4.0.22.ebuild: |
196 |
Improve ebuild, see bug #405585 and bug #405587. |