Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/resin/
Date: Sat, 26 Sep 2015 14:55:35
Message-Id: 1443279299.5676116363fce9e8efa0da74e136afdd18bbc069.chewi@gentoo
1 commit: 5676116363fce9e8efa0da74e136afdd18bbc069
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 26 14:54:59 2015 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 26 14:54:59 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56761163
7
8 www-servers/resin: Fix accidental SLOT mismatch
9
10 wltjr sends his apologies.
11
12 Package-Manager: portage-2.2.20.1
13
14 www-servers/resin/resin-4.0.44-r4.ebuild | 4 ++--
15 1 file changed, 2 insertions(+), 2 deletions(-)
16
17 diff --git a/www-servers/resin/resin-4.0.44-r4.ebuild b/www-servers/resin/resin-4.0.44-r4.ebuild
18 index 99cb5e8..dd2b257 100644
19 --- a/www-servers/resin/resin-4.0.44-r4.ebuild
20 +++ b/www-servers/resin/resin-4.0.44-r4.ebuild
21 @@ -44,7 +44,7 @@ mojarra-2.2
22 oracle-javamail
23 validation-api-1.0
24 glassfish-xmlrpc-api
25 -resin-servlet-api-3.0
26 +resin-servlet-api-3.1
27 glassfish-deployment-api-1.2"
28
29 PATCHES=(
30 @@ -145,7 +145,7 @@ src_install() {
31 dosym /var/lib/resin/watchdog-data ${RESIN_HOME}/watchdog-data
32
33 dosym \
34 - "$(java-pkg_getjar resin-servlet-api-3.0 resin-servlet-api.jar)" \
35 + "$(java-pkg_getjar resin-servlet-api-3.1 resin-servlet-api.jar)" \
36 "${JAVA_PKG_JARDEST}/resin-servlet-api.jar"
37
38 use admin && {