[gentoo-commits] repo/gentoo:master commit in: dev-java/tapestry/

[Patrice Clement]

commit:     b329dbd993db8575bd997191db87f84956154468
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  8 09:59:57 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Jan  8 10:28:41 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b329dbd9

dev-java/tapestry: Bump ognl SLOT.

Package-Manager: portage-2.2.26
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 ...pestry-3.0.4-r1.ebuild => tapestry-3.0.4-r2.ebuild} | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/dev-java/tapestry/tapestry-3.0.4-r1.ebuild 
b/dev-java/tapestry/tapestry-3.0.4-r2.ebuild
similarity index 88%
rename from dev-java/tapestry/tapestry-3.0.4-r1.ebuild
rename to dev-java/tapestry/tapestry-3.0.4-r2.ebuild
index e820ca5..15e8ef1 100644
--- a/dev-java/tapestry/tapestry-3.0.4-r1.ebuild
+++ b/dev-java/tapestry/tapestry-3.0.4-r2.ebuild
@@ -16,7 +16,7 @@ LICENSE="Apache-2.0"
 SLOT="3.0"
 KEYWORDS="~amd64 ~x86"
 
-COMMON_DEP="
+CDEPEND="
        dev-java/bsf:2.3
        dev-java/commons-beanutils:1.7
        dev-java/commons-codec:0
@@ -26,15 +26,17 @@ COMMON_DEP="
        dev-java/commons-logging:0
        dev-java/jakarta-oro:2.0
        dev-java/javassist:2
-       dev-java/ognl:2.6
+       dev-java/ognl:3.0
        dev-java/servletapi:2.4"
 
-RDEPEND=">=virtual/jre-1.4
-       ${COMMON_DEP}"
+RDEPEND="
+       ${CDEPEND}
+       >=virtual/jre-1.4"
 
-DEPEND=">=virtual/jdk-1.4
-       app-arch/unzip:0
-       ${COMMON_DEP}"
+DEPEND="
+       ${CDEPEND}
+       app-arch/unzip
+       >=virtual/jdk-1.4"
 
 IUSE="${JAVA_PKG_IUSE}"
 
@@ -42,7 +44,7 @@ S="${WORKDIR}/Tapestry-${PV}"
 
 EANT_GENTOO_CLASSPATH="commons-logging,commons-fileupload,commons-lang-2.1"
 EANT_GENTOO_CLASSPATH+=",commons-codec,commons-beanutils-1.7,commons-digester"
-EANT_GENTOO_CLASSPATH+=",servletapi-2.4,ognl-2.6,bsf-2.3,jakarta-oro-2.0"
+EANT_GENTOO_CLASSPATH+=",servletapi-2.4,ognl-3.0,bsf-2.3,jakarta-oro-2.0"
 EANT_GENTOO_CLASSPATH+=",javassist-2"
 JAVA_ANT_REWRITE_CLASSPATH="true"