| 1 |
nelchael 08/06/20 23:16:20 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: resin-3.1.6-r2.ebuild |
| 5 |
Removed: resin-3.1.6-r1.ebuild |
| 6 |
Log: |
| 7 |
Fix dependencies for users of JDK 1.6. |
| 8 |
(Portage version: 2.2_rc1/cvs/Linux 2.6.25-tuxonice-r5 x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.79 www-servers/resin/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/ChangeLog?rev=1.79&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/ChangeLog?rev=1.79&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/ChangeLog?r1=1.78&r2=1.79 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v |
| 20 |
retrieving revision 1.78 |
| 21 |
retrieving revision 1.79 |
| 22 |
diff -u -r1.78 -r1.79 |
| 23 |
--- ChangeLog 10 Jun 2008 21:01:58 -0000 1.78 |
| 24 |
+++ ChangeLog 20 Jun 2008 23:16:20 -0000 1.79 |
| 25 |
@@ -1,6 +1,12 @@ |
| 26 |
# ChangeLog for www-servers/resin |
| 27 |
# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.78 2008/06/10 21:01:58 nelchael Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.79 2008/06/20 23:16:20 nelchael Exp $ |
| 30 |
+ |
| 31 |
+*resin-3.1.6-r2 (20 Jun 2008) |
| 32 |
+ |
| 33 |
+ 20 Jun 2008; Krzysiek Pawlik <nelchael@g.o> files/3.1.6/resin.conf, |
| 34 |
+ -resin-3.1.6-r1.ebuild, +resin-3.1.6-r2.ebuild: |
| 35 |
+ Fix dependencies for users of JDK 1.6. |
| 36 |
|
| 37 |
*resin-3.0.26 (10 Jun 2008) |
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.1 www-servers/resin/resin-3.1.6-r2.ebuild |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/resin-3.1.6-r2.ebuild?rev=1.1&view=markup |
| 45 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/resin-3.1.6-r2.ebuild?rev=1.1&content-type=text/plain |
| 46 |
|
| 47 |
Index: resin-3.1.6-r2.ebuild |
| 48 |
=================================================================== |
| 49 |
# Copyright 1999-2008 Gentoo Foundation |
| 50 |
# Distributed under the terms of the GNU General Public License v2 |
| 51 |
# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.1.6-r2.ebuild,v 1.1 2008/06/20 23:16:20 nelchael Exp $ |
| 52 |
|
| 53 |
EAPI="1" |
| 54 |
|
| 55 |
JAVA_PKG_IUSE="doc source" |
| 56 |
|
| 57 |
inherit java-pkg-2 java-ant-2 eutils flag-o-matic multilib autotools |
| 58 |
|
| 59 |
DESCRIPTION="A fast Servlet 2.5 and JSP 2.0 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}-1.tar.bz2" |
| 63 |
LICENSE="GPL-2" |
| 64 |
SLOT="0" |
| 65 |
IUSE="admin" |
| 66 |
|
| 67 |
KEYWORDS="~amd64 ~ppc ~x86" |
| 68 |
|
| 69 |
COMMON_DEP="~dev-java/resin-servlet-api-${PV} |
| 70 |
dev-java/iso-relax |
| 71 |
dev-java/aopalliance |
| 72 |
=dev-java/sun-j2ee-deployment-bin-1.1* |
| 73 |
dev-java/jax-ws-api:2 |
| 74 |
dev-java/jaxb:2 |
| 75 |
java-virtuals/javamail |
| 76 |
java-virtuals/jaf" |
| 77 |
|
| 78 |
RDEPEND=">=virtual/jdk-1.5 |
| 79 |
${COMMON_DEP}" |
| 80 |
DEPEND=">=virtual/jdk-1.5 |
| 81 |
app-arch/unzip |
| 82 |
dev-java/ant-core |
| 83 |
dev-libs/openssl |
| 84 |
${COMMON_DEP}" |
| 85 |
|
| 86 |
RESIN_HOME="/usr/$(get_libdir)/resin" |
| 87 |
|
| 88 |
# Rewrites build.xml in documentation |
| 89 |
JAVA_PKG_BSFIX="off" |
| 90 |
|
| 91 |
src_unpack() { |
| 92 |
|
| 93 |
unpack ${A} |
| 94 |
for i in "${WORKDIR}"/${PV}/resin-${PV}-*; do |
| 95 |
epatch "${i}" |
| 96 |
done; |
| 97 |
|
| 98 |
java-ant_bsfix_one "${S}/build.xml" |
| 99 |
|
| 100 |
sed -i -e 's/256m/384m/' "${S}/build.xml" |
| 101 |
|
| 102 |
cd "${S}" |
| 103 |
eautoreconf |
| 104 |
|
| 105 |
} |
| 106 |
|
| 107 |
pkg_setup() { |
| 108 |
|
| 109 |
java-pkg-2_pkg_setup |
| 110 |
enewgroup resin |
| 111 |
enewuser resin -1 /bin/bash ${RESIN_HOME} resin |
| 112 |
|
| 113 |
} |
| 114 |
|
| 115 |
src_compile() { |
| 116 |
|
| 117 |
append-flags -fPIC -DPIC |
| 118 |
|
| 119 |
chmod 755 "${S}/configure" |
| 120 |
econf --prefix=${RESIN_HOME} || die "econf failed" |
| 121 |
|
| 122 |
einfo "Building libraries..." |
| 123 |
# Broken with -jn where n > 1 |
| 124 |
emake -j1 || die "emake failed" |
| 125 |
|
| 126 |
mkdir "${S}/lib" |
| 127 |
cd "${S}/lib" |
| 128 |
java-pkg_jar-from --virtual jaf |
| 129 |
java-pkg_jar-from --virtual javamail |
| 130 |
java-pkg_jar-from iso-relax |
| 131 |
java-pkg_jar-from aopalliance-1 |
| 132 |
java-pkg_jar-from sun-j2ee-deployment-bin-1.1 |
| 133 |
java-pkg_jar-from jax-ws-api-2 |
| 134 |
java-pkg_jar-from jaxb-2 |
| 135 |
java-pkg_jar-from resin-servlet-api-2.5 resin-servlet-api.jar jsdk-15.jar |
| 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/*.conf |
| 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 |
dosym /etc/resin/resin.conf /etc/resin/resin.xml |
| 184 |
|
| 185 |
use admin && { |
| 186 |
cp -a "${S}/php" "${D}/${RESIN_HOME}/" || die "cp failed" |
| 187 |
} |
| 188 |
|
| 189 |
use source && { |
| 190 |
einfo "Zipping source..." |
| 191 |
java-pkg_dosrc "${S}"/modules/*/src/* 2> /dev/null |
| 192 |
} |
| 193 |
|
| 194 |
einfo "Removing unneeded files..." |
| 195 |
rm -fr "${D}/${RESIN_HOME}/bin" |
| 196 |
rm -f "${D}"/etc/resin/*.orig |
| 197 |
|
| 198 |
einfo "Fixing permissions..." |
| 199 |
chown -R resin:resin "${D}${RESIN_HOME}" |
| 200 |
chown -R resin:resin "${D}/etc/resin" |
| 201 |
chown -R resin:resin "${D}/var/log/resin" |
| 202 |
chown -R resin:resin "${D}/var/lib/resin" |
| 203 |
chown -R resin:resin "${D}/var/run/resin" |
| 204 |
|
| 205 |
chmod 644 "${D}/etc/conf.d/resin" |
| 206 |
chmod 755 "${D}/etc/init.d/resin" |
| 207 |
chmod 750 "${D}/var/lib/resin" |
| 208 |
chmod 750 "${D}/var/run/resin" |
| 209 |
chmod 750 "${D}/etc/resin" |
| 210 |
|
| 211 |
} |
| 212 |
|
| 213 |
pkg_postinst() { |
| 214 |
|
| 215 |
elog |
| 216 |
elog " User and group 'resin' have been added." |
| 217 |
elog |
| 218 |
elog " By default, Resin runs on port 8080. You can change this" |
| 219 |
elog " value by editing /etc/resin/resin.conf." |
| 220 |
elog |
| 221 |
elog " webapps directory was moved to /var/lib/resin/webapps" |
| 222 |
elog |
| 223 |
elog " Most options has been moved from /etc/conf.d/resin to" |
| 224 |
elog " /etc/resin/resin.conf." |
| 225 |
elog |
| 226 |
|
| 227 |
} |
| 228 |
|
| 229 |
|
| 230 |
|
| 231 |
-- |
| 232 |
gentoo-commits@l.g.o mailing list |
Archives