diff options
| author |   Krzysztof Pawlik <nelchael@gentoo.org> | 2009-05-09 15:39:47 +0000 |
|---|---|---|
| committer | Krzysztof Pawlik <nelchael@gentoo.org> | 2009-05-09 15:39:47 +0000 |
| commit | 2b00294d5685294fb03a7f7711361eeba53e0fdb (patch) | |
| tree | f35b33ac658487b994c4fcf0d3c423cb902624b6 | |
| parent | Version bump (diff) | |
| download | gentoo-2-2b00294d5685294fb03a7f7711361eeba53e0fdb.tar.gz gentoo-2-2b00294d5685294fb03a7f7711361eeba53e0fdb.tar.bz2 gentoo-2-2b00294d5685294fb03a7f7711361eeba53e0fdb.zip | |
Use new J2EE deployment-api.
(Portage version: 2.1.6.13/cvs/Linux x86_64)
| -rw-r--r-- | www-servers/resin/ChangeLog | 8 | ||||
| -rw-r--r-- | www-servers/resin/resin-3.2.1-r3.ebuild (renamed from www-servers/resin/resin-3.2.1-r2.ebuild) | 10 |
2 files changed, 11 insertions, 7 deletions
diff --git a/www-servers/resin/ChangeLog b/www-servers/resin/ChangeLog index a078b064ad4a..8c7775581c72 100644 --- a/www-servers/resin/ChangeLog +++ b/www-servers/resin/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for www-servers/resin # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.87 2009/05/03 15:11:04 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.88 2009/05/09 15:39:47 nelchael Exp $ + +*resin-3.2.1-r3 (09 May 2009) + + 09 May 2009; Krzysiek Pawlik <nelchael@gentoo.org> -resin-3.2.1-r2.ebuild, + +resin-3.2.1-r3.ebuild: + Use new J2EE deployment-api. *resin-3.2.1-r2 (03 May 2009) diff --git a/www-servers/resin/resin-3.2.1-r2.ebuild b/www-servers/resin/resin-3.2.1-r3.ebuild index f4b6de6d4d96..b5610e943974 100644 --- a/www-servers/resin/resin-3.2.1-r2.ebuild +++ b/www-servers/resin/resin-3.2.1-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $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 $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.2.1-r3.ebuild,v 1.1 2009/05/09 15:39:47 nelchael Exp $ EAPI="2" @@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~ppc ~x86" ## java-virtuals/jaf" COMMON_DEP="~dev-java/resin-servlet-api-${PV} - =dev-java/sun-j2ee-deployment-bin-1.1* + dev-java/glassfish-deployment-api:1.2 java-virtuals/javamail" RDEPEND=">=virtual/jdk-1.5 @@ -44,9 +44,8 @@ pkg_setup() { } -src_unpack() { +src_prepare() { - unpack ${A} for i in "${WORKDIR}"/${PV}/resin-${PV}-*; do epatch "${i}" done; @@ -56,7 +55,6 @@ src_unpack() { sed -i -e 's/256m/384m/' "${S}/build.xml" - cd "${S}" eautoreconf } @@ -82,7 +80,7 @@ src_compile() { java-pkg_jar-from --virtual javamail # java-pkg_jar-from iso-relax # java-pkg_jar-from aopalliance-1 - java-pkg_jar-from sun-j2ee-deployment-bin-1.1 + java-pkg_jar-from glassfish-deployment-api-1.2 java-pkg_jar-from resin-servlet-api-2.5 ln -s $(java-config --jdk-home)/lib/tools.jar cd "${S}" |