From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A3DDB13881D for ; Sat, 26 Sep 2015 14:55:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E532E21C00A; Sat, 26 Sep 2015 14:55:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 936AC21C00A for ; Sat, 26 Sep 2015 14:55:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 626A5340BE8 for ; Sat, 26 Sep 2015 14:55:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8E6DF1F9 for ; Sat, 26 Sep 2015 14:55:30 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1443279299.5676116363fce9e8efa0da74e136afdd18bbc069.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/resin/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-servers/resin/resin-4.0.44-r4.ebuild X-VCS-Directories: www-servers/resin/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 5676116363fce9e8efa0da74e136afdd18bbc069 X-VCS-Branch: master Date: Sat, 26 Sep 2015 14:55:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 54ff09b0-7aed-4e12-a455-e0ad1840941c X-Archives-Hash: bd28237f4fd55ecdcdb17cb5286e1923 commit: 5676116363fce9e8efa0da74e136afdd18bbc069 Author: James Le Cuirot gentoo org> AuthorDate: Sat Sep 26 14:54:59 2015 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Sat Sep 26 14:54:59 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56761163 www-servers/resin: Fix accidental SLOT mismatch wltjr sends his apologies. Package-Manager: portage-2.2.20.1 www-servers/resin/resin-4.0.44-r4.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www-servers/resin/resin-4.0.44-r4.ebuild b/www-servers/resin/resin-4.0.44-r4.ebuild index 99cb5e8..dd2b257 100644 --- a/www-servers/resin/resin-4.0.44-r4.ebuild +++ b/www-servers/resin/resin-4.0.44-r4.ebuild @@ -44,7 +44,7 @@ mojarra-2.2 oracle-javamail validation-api-1.0 glassfish-xmlrpc-api -resin-servlet-api-3.0 +resin-servlet-api-3.1 glassfish-deployment-api-1.2" PATCHES=( @@ -145,7 +145,7 @@ src_install() { dosym /var/lib/resin/watchdog-data ${RESIN_HOME}/watchdog-data dosym \ - "$(java-pkg_getjar resin-servlet-api-3.0 resin-servlet-api.jar)" \ + "$(java-pkg_getjar resin-servlet-api-3.1 resin-servlet-api.jar)" \ "${JAVA_PKG_JARDEST}/resin-servlet-api.jar" use admin && {