dev-util/checkstyle: EAPI bump, use split antlr-2 and guava-18

Java version raised to 6 to match guava-18. ~ppc keyword also added.

Package-Manager: portage-2.2.20.1

diff --git a/dev-util/checkstyle/checkstyle-5.5.ebuild b/dev-util/checkstyle/checkstyle-5.5-r1.ebuild
similarity index 84%
rename from dev-util/checkstyle/checkstyle-5.5.ebuild
rename to dev-util/checkstyle/checkstyle-5.5-r1.ebuild
index debd4ccf8d413d91ee842b54a0589548f693411f..7a81a421c4c1df6f5eaaadd7aa5c6f1f96f66740 100644 (file)
--- a/dev-util/checkstyle/checkstyle-5.5.ebuild
+++ b/dev-util/checkstyle/checkstyle-5.5-r1.ebuild
@@ -1,34 +1,34 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI="5"
 
 JAVA_PKG_IUSE="doc source test"
 
 inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="A development tool to help programmers write Java code that adheres to a coding standard"
-HOMEPAGE="http://checkstyle.sourceforge.net"
+HOMEPAGE="https://github.com/checkstyle/checkstyle"
 SRC_URI="mirror://sourceforge/checkstyle/${P}-src.tar.gz
        https://dev.gentoo.org/~sera/distfiles/${PN}-5.4-maven-build.xml.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 COMMON_DEP="
        dev-java/ant-core:0
-       >=dev-java/antlr-2.7.7:0[java]
+       >=dev-java/antlr-2.7.7-r7:0
        dev-java/commons-beanutils:1.7
        dev-java/commons-cli:1
        dev-java/commons-logging:0
-       dev-java/guava:0"
+       dev-java/guava:18"
 RDEPEND="${COMMON_DEP}
-       >=virtual/jre-1.5"
+       >=virtual/jre-1.6"
 DEPEND="${COMMON_DEP}
-       >=virtual/jdk-1.5
+       >=virtual/jdk-1.6
        dev-java/ant-nodeps:0
        test? (
                dev-java/ant-junit
@@ -43,7 +43,7 @@ java_prepare() {
 
        # maven ant:ant can't handle it.
        pushd src/checkstyle/com/puppycrawl/tools/checkstyle/grammars > /dev/null || die
-               java -cp $(java-pkg_getjars antlr) antlr.Tool java.g || die
+               antlr java.g || die
        popd > /dev/null
 }
 
@@ -53,7 +53,7 @@ JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
 JAVA_ANT_ENCODING="iso-8859-1"
 
 EANT_BUILD_XML="maven-build.xml"
-EANT_GENTOO_CLASSPATH="ant-core,antlr,commons-beanutils-1.7,commons-cli-1,commons-logging,guava"
+EANT_GENTOO_CLASSPATH="ant-core,antlr,commons-beanutils-1.7,commons-cli-1,commons-logging,guava-18"
 EANT_BUILD_TARGET="package"
 EANT_ANT_TASKS="ant-nodeps"
 EANT_NEEDS_TOOLS="true"