[gentoo-commits] repo/gentoo:master commit in: dev-util/checkstyle/

2022-02-25 Thread Miroslav Šulc 
commit: 3de42d3f7e45f01d8106a73acc5ef3640110f4a9
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Feb 25 08:11:13 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Feb 25 08:11:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3de42d3f

dev-util/checkstyle: removed obsolete 7.2

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-util/checkstyle/checkstyle-7.2.ebuild | 66 ---
 1 file changed, 66 deletions(-)

diff --git a/dev-util/checkstyle/checkstyle-7.2.ebuild 
b/dev-util/checkstyle/checkstyle-7.2.ebuild
deleted file mode 100644
index 9d19d64351b2..
--- a/dev-util/checkstyle/checkstyle-7.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Development tool to help write Java code that adheres to a coding 
standard"
-HOMEPAGE="https://github.com/checkstyle/checkstyle;
-SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz;
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-CP_DEPEND="
-   dev-java/ant-core:0
-   >=dev-java/antlr-2.7.7-r7:0
-   dev-java/antlr:4
-   dev-java/commons-beanutils:1.7
-   >=dev-java/commons-cli-1.3:1
-   dev-java/commons-logging:0
-   dev-java/guava:20
-"
-
-RDEPEND="${CP_DEPEND}
-   >=virtual/jre-1.8"
-
-DEPEND="${CP_DEPEND}
-   >=virtual/jdk-1.8"
-
-S="${WORKDIR}/${PN}-${P}"
-JAVA_SRC_DIR="${S}/src/main/java"
-
-src_configure() {
-   JAVA_GENTOO_CLASSPATH_EXTRA=$(java-config --tools)
-}
-
-src_compile() {
-   local PKG
-
-   PKG=com/puppycrawl/tools/checkstyle/grammars
-   cd "${S}"/src/main/resources/${PKG} || die
-   antlr -o "${JAVA_SRC_DIR}"/${PKG} java.g || die
-
-   PKG+=/javadoc
-   cd "${S}"/src/main/resources/${PKG} || die
-   antlr4 -o "${JAVA_SRC_DIR}"/${PKG} -package ${PKG//\//.} 
JavadocLexer.g4 || die
-   antlr4 -o "${JAVA_SRC_DIR}"/${PKG} -package ${PKG//\//.} 
JavadocParser.g4 || die
-
-   cd "${S}" || die
-   java-pkg-simple_src_compile
-   java-pkg_addres ${PN}.jar src/main/resources
-}
-
-src_install() {
-   java-pkg-simple_src_install
-   dodoc README.md
-
-   java-pkg_dolauncher ${PN} \
-   --main com.puppycrawl.tools.checkstyle.Main
-
-   java-pkg_dolauncher ${PN}-gui \
-   --main com.puppycrawl.tools.checkstyle.gui.Main
-}

[gentoo-commits] repo/gentoo:master commit in: dev-util/checkstyle/

2022-02-24 Thread Agostino Sarubbo 
commit: 33d7727fc33acbe89baca124bced091d6013f30c
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Feb 25 07:57:21 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Feb 25 07:57:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33d7727f

dev-util/checkstyle: x86 stable wrt bug #828600

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-util/checkstyle/checkstyle-7.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/checkstyle/checkstyle-7.2-r1.ebuild 
b/dev-util/checkstyle/checkstyle-7.2-r1.ebuild
index 8b14288c8143..564d30830696 100644
--- a/dev-util/checkstyle/checkstyle-7.2-r1.ebuild
+++ b/dev-util/checkstyle/checkstyle-7.2-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/checkstyle/checkstyle;
 SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz;
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 CP_DEPEND="
dev-java/ant-core:0

[gentoo-commits] repo/gentoo:master commit in: dev-util/checkstyle/

2022-02-24 Thread Agostino Sarubbo 
commit: 77784bdd4af72650a6f5ecab15fb3e0d545573fa
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Feb 25 07:55:29 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Feb 25 07:55:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77784bdd

dev-util/checkstyle: amd64 stable wrt bug #828600

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-util/checkstyle/checkstyle-7.2-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/checkstyle/checkstyle-7.2-r1.ebuild 
b/dev-util/checkstyle/checkstyle-7.2-r1.ebuild
index 5411c86efbbd..8b14288c8143 100644
--- a/dev-util/checkstyle/checkstyle-7.2-r1.ebuild
+++ b/dev-util/checkstyle/checkstyle-7.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/checkstyle/checkstyle;
 SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz;
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 CP_DEPEND="
dev-java/ant-core:0

[gentoo-commits] repo/gentoo:master commit in: dev-util/checkstyle/

2021-12-09 Thread Miroslav Šulc 
commit: dc590da2aa2c9f9d646f5cd1ad85bd9aaa009e47
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Mon Dec  6 10:23:24 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Dec  9 08:17:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc590da2

dev-util/checkstyle: EAPI 8, fix missing dependency

Closes: https://bugs.gentoo.org/791283
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/23196
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-util/checkstyle/checkstyle-7.2-r1.ebuild | 67 
 1 file changed, 67 insertions(+)

diff --git a/dev-util/checkstyle/checkstyle-7.2-r1.ebuild 
b/dev-util/checkstyle/checkstyle-7.2-r1.ebuild
new file mode 100644
index ..5411c86efbbd
--- /dev/null
+++ b/dev-util/checkstyle/checkstyle-7.2-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Development tool to help write Java code that adheres to a coding 
standard"
+HOMEPAGE="https://github.com/checkstyle/checkstyle;
+SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz;
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+CP_DEPEND="
+   dev-java/ant-core:0
+   >=dev-java/antlr-2.7.7-r7:0
+   dev-java/antlr:4
+   dev-java/commons-beanutils:1.7
+   dev-java/commons-cli:1
+   dev-java/commons-logging:0
+   dev-java/guava:20
+   dev-java/jaxb-api:2
+"
+
+RDEPEND="${CP_DEPEND}
+   >=virtual/jre-1.8:*"
+
+DEPEND="${CP_DEPEND}
+   >=virtual/jdk-1.8:*"
+
+S="${WORKDIR}/${PN}-${P}"
+JAVA_SRC_DIR="${S}/src/main/java"
+
+src_configure() {
+   JAVA_GENTOO_CLASSPATH_EXTRA=$(java-config --tools)
+}
+
+src_compile() {
+   local PKG
+
+   PKG=com/puppycrawl/tools/checkstyle/grammars
+   cd "${S}"/src/main/resources/${PKG} || die
+   antlr -o "${JAVA_SRC_DIR}"/${PKG} java.g || die
+
+   PKG+=/javadoc
+   cd "${S}"/src/main/resources/${PKG} || die
+   antlr4 -o "${JAVA_SRC_DIR}"/${PKG} -package ${PKG//\//.} 
JavadocLexer.g4 || die
+   antlr4 -o "${JAVA_SRC_DIR}"/${PKG} -package ${PKG//\//.} 
JavadocParser.g4 || die
+
+   cd "${S}" || die
+   java-pkg-simple_src_compile
+   java-pkg_addres ${PN}.jar src/main/resources
+}
+
+src_install() {
+   java-pkg-simple_src_install
+   dodoc README.md
+
+   java-pkg_dolauncher ${PN} \
+   --main com.puppycrawl.tools.checkstyle.Main
+
+   java-pkg_dolauncher ${PN}-gui \
+   --main com.puppycrawl.tools.checkstyle.gui.Main
+}

[gentoo-commits] repo/gentoo:master commit in: dev-util/checkstyle/

2017-09-01 Thread James Le Cuirot 
commit: c4820f7c6ef110f5aa123cfbddedf60dd7fd630c
Author: James Le Cuirot  gentoo  org>
AuthorDate: Fri Sep  1 20:12:29 2017 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Fri Sep  1 20:13:10 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4820f7c

dev-util/checkstyle: Remove old 5.5-r1

Package-Manager: Portage-2.3.8, Repoman-2.3.2

 dev-util/checkstyle/Manifest |  2 -
 dev-util/checkstyle/checkstyle-5.5-r1.ebuild | 82 
 2 files changed, 84 deletions(-)

diff --git a/dev-util/checkstyle/Manifest b/dev-util/checkstyle/Manifest
index 26db3d461e3..8107b108ec6 100644
--- a/dev-util/checkstyle/Manifest
+++ b/dev-util/checkstyle/Manifest
@@ -1,3 +1 @@
-DIST checkstyle-5.4-maven-build.xml.tar.bz2 3236 SHA256 
4b286857c265b765fcf71deb8684cdd1bb7d1264fd0ee45a924d91031652d590 SHA512 
23cfcb519984fd9d7a59d8534c712d69c02aabc28e9f6eb7abff948728361cc208bf84d19f30dc81ae8870f6b361ca0382be60c4ab7b7b0298e59a175197138e
 WHIRLPOOL 
32992aa00d228be5f0819e856f13752eba9694cf46e98b3c9229c5ef45a7c37c1c6367a1457487ec5ab63f9d808b1470727f44e5b7d194961520a34b55253f72
-DIST checkstyle-5.5-src.tar.gz 744584 SHA256 
0de571f2769b4ded9c681c9b1e51c7f783aca7fb7f47467f1f39c38bd1717aa1 SHA512 
2327e14fc6fe9516d9518e4cbccb2e0f41e50bf891b7a3655dd29601b5eb3d2895d7df841f394d08d7dfac7ab774a01e22f98226259dc28a210d478699ea5c9a
 WHIRLPOOL 
e29303b656090a2f617850d2edb7f3f41db912399d334d6d8a7f7c50a96c7cfdb8134e46b65cec762ce565b1709de98a870880cdd8e18af03f594b9a2141609a
 DIST checkstyle-7.2.tar.gz 3359817 SHA256 
8f5c262a3f2e1194b60d6b837b8eefbe6fe63fba57be4acb20f0709919870523 SHA512 
ee99d96d99a3f75097297cfda46e3647e57213bcb8b78098251a21c3fe0b4bb774393848d444f721d4bea83173581c89377a9d250157d6e6a225239da81d955f
 WHIRLPOOL 
1da3e380bd3842ee6fda3210225e62f5e179d0232eabffaff0ba9347263f564db08750b84e6736184b4f56cc63b30aa8dba52d6e5412f5bdcd0845f1f770c5f5

diff --git a/dev-util/checkstyle/checkstyle-5.5-r1.ebuild 
b/dev-util/checkstyle/checkstyle-5.5-r1.ebuild
deleted file mode 100644
index 0a6ea6e2d6c..000
--- a/dev-util/checkstyle/checkstyle-5.5-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Development tool to help write Java code that adheres to a coding 
standard"
-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"
-IUSE=""
-
-COMMON_DEP="
-   dev-java/ant-core:0
-   >=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:18"
-RDEPEND="${COMMON_DEP}
-   >=virtual/jre-1.6"
-DEPEND="${COMMON_DEP}
-   >=virtual/jdk-1.6
-   test? ( dev-java/ant-junit:0 )"
-
-java_prepare() {
-   cp ../${PN}-5.4/maven-build.xml . || die
-   echo "maven.build.finalName=${P}" > maven-build.properties || die
-
-   epatch "${WORKDIR}"/maven-build.xml.patch
-
-   # maven ant:ant can't handle it.
-   pushd src/checkstyle/com/puppycrawl/tools/checkstyle/grammars > 
/dev/null || die
-   antlr java.g || die
-   popd > /dev/null
-}
-
-JAVA_PKG_BSFIX_NAME="maven-build.xml"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-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-18"
-EANT_BUILD_TARGET="package"
-EANT_NEEDS_TOOLS="true"
-
-EANT_EXTRA_ARGS="-Dmaven.repo.local=/dev/null"
-EANT_TEST_EXTRA_ARGS="${EANT_EXTRA_ARGS} -Djunit.present=true"
-
-src_test() {
-   java-pkg-2_src_test
-}
-
-src_install() {
-   java-pkg_newjar target/${P}.jar
-
-   dodoc README
-   use doc && java-pkg_dojavadoc target/site/apidocs
-   use source && java-pkg_dosrc src/${PN}/com
-
-   # Install check files
-   insinto /usr/share/checkstyle/checks
-   doins suppressions.xml sun_checks.xml import-control.xml 
checkstyle_checks.xml
-
-   # Install extra files
-   insinto  /usr/share/checkstyle/contrib
-   doins -r contrib/*
-
-   java-pkg_dolauncher ${PN} \
-   --main com.puppycrawl.tools.checkstyle.Main
-
-   java-pkg_dolauncher ${PN}-gui \
-   --main com.puppycrawl.tools.checkstyle.gui.Main
-}

[gentoo-commits] repo/gentoo:master commit in: dev-util/checkstyle/

2017-09-01 Thread James Le Cuirot 
commit: 122fcdf47335e691d09ef1722de060c1c491b2e0
Author: James Le Cuirot  gentoo  org>
AuthorDate: Fri Sep  1 20:11:58 2017 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Fri Sep  1 20:13:08 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=122fcdf4

dev-util/checkstyle: 7.2 stable on amd64 and x86 using ALLARCHES

Package-Manager: Portage-2.3.8, Repoman-2.3.2

 dev-util/checkstyle/checkstyle-7.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/checkstyle/checkstyle-7.2.ebuild 
b/dev-util/checkstyle/checkstyle-7.2.ebuild
index 5099ac96535..0036872cb55 100644
--- a/dev-util/checkstyle/checkstyle-7.2.ebuild
+++ b/dev-util/checkstyle/checkstyle-7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/checkstyle/checkstyle;
 SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz;
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 CP_DEPEND="
dev-java/ant-core:0

[gentoo-commits] repo/gentoo:master commit in: dev-util/checkstyle/

2016-11-21 Thread James Le Cuirot 
commit: 384042d1d843768f05b3b50852d46e83742ff65f
Author: James Le Cuirot  gentoo  org>
AuthorDate: Mon Nov 21 23:02:51 2016 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon Nov 21 23:02:51 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=384042d1

dev-util/checkstyle: Version bump to 7.2, EAPI bump to 6

Package-Manager: portage-2.3.2

 dev-util/checkstyle/Manifest  |  1 +
 dev-util/checkstyle/checkstyle-7.2.ebuild | 67 +++
 2 files changed, 68 insertions(+)

diff --git a/dev-util/checkstyle/Manifest b/dev-util/checkstyle/Manifest
index 0e0d068..26db3d4 100644
--- a/dev-util/checkstyle/Manifest
+++ b/dev-util/checkstyle/Manifest
@@ -1,2 +1,3 @@
 DIST checkstyle-5.4-maven-build.xml.tar.bz2 3236 SHA256 
4b286857c265b765fcf71deb8684cdd1bb7d1264fd0ee45a924d91031652d590 SHA512 
23cfcb519984fd9d7a59d8534c712d69c02aabc28e9f6eb7abff948728361cc208bf84d19f30dc81ae8870f6b361ca0382be60c4ab7b7b0298e59a175197138e
 WHIRLPOOL 
32992aa00d228be5f0819e856f13752eba9694cf46e98b3c9229c5ef45a7c37c1c6367a1457487ec5ab63f9d808b1470727f44e5b7d194961520a34b55253f72
 DIST checkstyle-5.5-src.tar.gz 744584 SHA256 
0de571f2769b4ded9c681c9b1e51c7f783aca7fb7f47467f1f39c38bd1717aa1 SHA512 
2327e14fc6fe9516d9518e4cbccb2e0f41e50bf891b7a3655dd29601b5eb3d2895d7df841f394d08d7dfac7ab774a01e22f98226259dc28a210d478699ea5c9a
 WHIRLPOOL 
e29303b656090a2f617850d2edb7f3f41db912399d334d6d8a7f7c50a96c7cfdb8134e46b65cec762ce565b1709de98a870880cdd8e18af03f594b9a2141609a
+DIST checkstyle-7.2.tar.gz 3359817 SHA256 
8f5c262a3f2e1194b60d6b837b8eefbe6fe63fba57be4acb20f0709919870523 SHA512 
ee99d96d99a3f75097297cfda46e3647e57213bcb8b78098251a21c3fe0b4bb774393848d444f721d4bea83173581c89377a9d250157d6e6a225239da81d955f
 WHIRLPOOL 
1da3e380bd3842ee6fda3210225e62f5e179d0232eabffaff0ba9347263f564db08750b84e6736184b4f56cc63b30aa8dba52d6e5412f5bdcd0845f1f770c5f5

diff --git a/dev-util/checkstyle/checkstyle-7.2.ebuild 
b/dev-util/checkstyle/checkstyle-7.2.ebuild
new file mode 100644
index ..083d43d
--- /dev/null
+++ b/dev-util/checkstyle/checkstyle-7.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Development tool to help write Java code that adheres to a coding 
standard"
+HOMEPAGE="https://github.com/checkstyle/checkstyle;
+SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz;
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+
+CP_DEPEND="
+   dev-java/ant-core:0
+   >=dev-java/antlr-2.7.7-r7:0
+   dev-java/antlr:4
+   dev-java/commons-beanutils:1.7
+   >=dev-java/commons-cli-1.3:1
+   dev-java/commons-logging:0
+   dev-java/guava:20
+"
+
+RDEPEND="${CP_DEPEND}
+   >=virtual/jre-1.8"
+
+DEPEND="${CP_DEPEND}
+   >=virtual/jdk-1.8"
+
+S="${WORKDIR}/${PN}-${P}"
+JAVA_SRC_DIR="${S}/src/main/java"
+
+src_configure() {
+   JAVA_GENTOO_CLASSPATH_EXTRA=$(java-config --tools)
+}
+
+src_compile() {
+   local PKG
+
+   PKG=com/puppycrawl/tools/checkstyle/grammars
+   cd "${S}"/src/main/resources/${PKG} || die
+   antlr -o "${JAVA_SRC_DIR}"/${PKG} java.g || die
+
+   PKG+=/javadoc
+   cd "${S}"/src/main/resources/${PKG} || die
+   antlr4 -o "${JAVA_SRC_DIR}"/${PKG} -package ${PKG//\//.} 
JavadocLexer.g4 || die
+   antlr4 -o "${JAVA_SRC_DIR}"/${PKG} -package ${PKG//\//.} 
JavadocParser.g4 || die
+
+   cd "${S}" || die
+   java-pkg-simple_src_compile
+   java-pkg_addres ${PN}.jar src/main/resources
+}
+
+src_install() {
+   java-pkg-simple_src_install
+   dodoc README.md
+
+   java-pkg_dolauncher ${PN} \
+   --main com.puppycrawl.tools.checkstyle.Main
+
+   java-pkg_dolauncher ${PN}-gui \
+   --main com.puppycrawl.tools.checkstyle.gui.Main
+}

[gentoo-commits] repo/gentoo:master commit in: dev-util/checkstyle/

2016-01-14 Thread James Le Cuirot 
commit: fd2e3a66836f82d1709ac330f3b5831fbdbd65b1
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Jan  2 23:18:48 2016 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Jan 14 21:42:52 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd2e3a66

dev-util/checkstyle: Remove old, closes bug #561730

Package-Manager: portage-2.2.26

 dev-util/checkstyle/Manifest  |  1 -
 dev-util/checkstyle/checkstyle-4.4.ebuild | 96 ---
 2 files changed, 97 deletions(-)

diff --git a/dev-util/checkstyle/Manifest b/dev-util/checkstyle/Manifest
index acc6d14..0e0d068 100644
--- a/dev-util/checkstyle/Manifest
+++ b/dev-util/checkstyle/Manifest
@@ -1,3 +1,2 @@
 DIST checkstyle-5.4-maven-build.xml.tar.bz2 3236 SHA256 
4b286857c265b765fcf71deb8684cdd1bb7d1264fd0ee45a924d91031652d590 SHA512 
23cfcb519984fd9d7a59d8534c712d69c02aabc28e9f6eb7abff948728361cc208bf84d19f30dc81ae8870f6b361ca0382be60c4ab7b7b0298e59a175197138e
 WHIRLPOOL 
32992aa00d228be5f0819e856f13752eba9694cf46e98b3c9229c5ef45a7c37c1c6367a1457487ec5ab63f9d808b1470727f44e5b7d194961520a34b55253f72
 DIST checkstyle-5.5-src.tar.gz 744584 SHA256 
0de571f2769b4ded9c681c9b1e51c7f783aca7fb7f47467f1f39c38bd1717aa1 SHA512 
2327e14fc6fe9516d9518e4cbccb2e0f41e50bf891b7a3655dd29601b5eb3d2895d7df841f394d08d7dfac7ab774a01e22f98226259dc28a210d478699ea5c9a
 WHIRLPOOL 
e29303b656090a2f617850d2edb7f3f41db912399d334d6d8a7f7c50a96c7cfdb8134e46b65cec762ce565b1709de98a870880cdd8e18af03f594b9a2141609a
-DIST checkstyle-src-4.4.tar.gz 2567907 SHA256 
7081074124e2dde062b06cbb489a1338e04623b986094e9b63f31c50be2f9f38 SHA512 
4cce16b70e901bdcee0d3ac864f51cef54965d37223a11e59b7b9d34603b404da0cc8207431481feb5f0e649b5f55a5ef05aebfceeb37f938246f8722867174d
 WHIRLPOOL 
ae3b1f3161caac22235d20b018b035b4bf1e042f5fb930b620b6eae8692a1825fe382649a3d360794a8cb3d48135ea1e3e8597865ed10c0e868d9440e9287240

diff --git a/dev-util/checkstyle/checkstyle-4.4.ebuild 
b/dev-util/checkstyle/checkstyle-4.4.ebuild
deleted file mode 100644
index 08c1e50..000
--- a/dev-util/checkstyle/checkstyle-4.4.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-WANT_ANT_TASKS="ant-antlr ant-nodeps"
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="${PN}-src-${PV}"
-DESCRIPTION="A development tool to help programmers write Java code that 
adheres to a coding standard"
-HOMEPAGE="http://checkstyle.sourceforge.net;
-SRC_URI="mirror://sourceforge/checkstyle/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
-
-COMMON_DEP=">=dev-java/antlr-2.7.7:0[java]
-   dev-java/commons-beanutils:1.7
-   dev-java/commons-cli:1
-   dev-java/commons-logging:0
-   dev-java/commons-collections:0"
-
-RDEPEND=">=virtual/jre-1.4
-   ${COMMON_DEP}"
-
-DEPEND="!test? ( >=virtual/jdk-1.4 )
-   test? ( >=virtual/jdk-1.5 )
-   ${COMMON_DEP}
-   test? (
-   dev-java/ant-junit
-   dev-java/ant-trax
-   dev-java/emma:0
-   )"
-
-S="${WORKDIR}/${MY_P}"
-
-# So that we can generate 1.4 bytecode for dist
-# and 1.5 for tests
-JAVA_PKG_BSFIX="off"
-
-java_prepare() {
-   cd "${S}/lib"
-   rm -v *.jar || die
-   java-pkg_jar-from antlr
-   java-pkg_jar-from commons-beanutils-1.7
-   java-pkg_jar-from commons-cli-1
-   java-pkg_jar-from commons-logging
-   java-pkg_jar-from commons-collections
-}
-
-src_compile() {
-   eant compile.checkstyle $(use_doc)
-   jar cfm ${PN}.jar config/manifest.mf -C target/checkstyle . || die "jar 
failed"
-}
-
-src_test() {
-   java-pkg_jar-from --build-only --into lib junit
-   java-pkg_jar-from --build-only --into lib emma
-   ANT_TASKS="emma ant-nodeps ant-junit ant-trax" eant run.tests
-}
-
-src_install() {
-   java-pkg_dojar ${PN}.jar
-
-   dodoc README RIGHTS.antlr || die
-   use doc && java-pkg_dojavadoc target/docs/api
-   use source && java-pkg_dosrc src/${PN}/com
-
-   # Install check files
-   insinto /usr/share/checkstyle/checks
-   for file in *.xml; do
-   [[ "${file}" != build.xml ]] && doins ${file}
-   done
-
-   # Install extra files
-   insinto  /usr/share/checkstyle/contrib
-   doins -r contrib/*
-
-   java-pkg_dolauncher ${PN} \
-   --main com.puppycrawl.tools.checkstyle.Main
-
-   java-pkg_dolauncher ${PN}-gui \
-   --main com.puppycrawl.tools.checkstyle.gui.Main
-
-   # Make the ant tasks available to ant
-   java-pkg_register-ant-task
-}
-
-pkg_postinst() {
-   elog "Checkstyle is located at /usr/bin/checkstyle"
-   elog "Check files are located in /usr/share/checkstyle/checks/"
-}

[gentoo-commits] repo/gentoo:master commit in: dev-util/checkstyle/

2016-01-14 Thread James Le Cuirot 
commit: 492461def737fce379ff440e1eaf6fa7fde86016
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Jan  2 23:17:51 2016 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Jan 14 21:42:52 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=492461de

dev-util/checkstyle: Mark 5.5-r1 stable using ALLARCHES policy

Package-Manager: portage-2.2.26

 dev-util/checkstyle/checkstyle-5.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/checkstyle/checkstyle-5.5-r1.ebuild 
b/dev-util/checkstyle/checkstyle-5.5-r1.ebuild
index 93a4a64..23c5a23 100644
--- a/dev-util/checkstyle/checkstyle-5.5-r1.ebuild
+++ b/dev-util/checkstyle/checkstyle-5.5-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/checkstyle/${P}-src.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 COMMON_DEP="

[gentoo-commits] repo/gentoo:master commit in: dev-util/checkstyle/

2016-01-02 Thread James Le Cuirot 
commit: b0a4d64b670d0a2f93932dc0db3fe43ef9b97ad0
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Jan  2 23:05:02 2016 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Jan  2 23:10:42 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0a4d64b

dev-util/checkstyle: Make the tests actually run

They previously weren't being run due to a problem location
junit. Includes a quick and dirty workaround to avoid test breakages
from using jars within ~/.m2.

Package-Manager: portage-2.2.26

 dev-util/checkstyle/checkstyle-5.5-r1.ebuild | 15 ++-
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/dev-util/checkstyle/checkstyle-5.5-r1.ebuild 
b/dev-util/checkstyle/checkstyle-5.5-r1.ebuild
index 7a81a42..93a4a64 100644
--- a/dev-util/checkstyle/checkstyle-5.5-r1.ebuild
+++ b/dev-util/checkstyle/checkstyle-5.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -8,7 +8,7 @@ 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"
+DESCRIPTION="Development tool to help write Java code that adheres to a coding 
standard"
 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;
@@ -29,11 +29,7 @@ RDEPEND="${COMMON_DEP}
>=virtual/jre-1.6"
 DEPEND="${COMMON_DEP}
>=virtual/jdk-1.6
-   dev-java/ant-nodeps:0
-   test? (
-   dev-java/ant-junit
-   dev-java/junit:4
-   )"
+   test? ( dev-java/ant-junit:0 )"
 
 java_prepare() {
cp ../${PN}-5.4/maven-build.xml . || die
@@ -55,11 +51,12 @@ 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-18"
 EANT_BUILD_TARGET="package"
-EANT_ANT_TASKS="ant-nodeps"
 EANT_NEEDS_TOOLS="true"
 
+EANT_EXTRA_ARGS="-Dmaven.repo.local=/dev/null"
+EANT_TEST_EXTRA_ARGS="${EANT_EXTRA_ARGS} -Djunit.present=true"
+
 src_test() {
-   EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
java-pkg-2_src_test
 }

[gentoo-commits] repo/gentoo:master commit in: dev-util/checkstyle/

2015-12-06 Thread James Le Cuirot 
commit: 52991eee68d6dfa757a5faeadc1fce641dffc0d5
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Oct 18 13:43:37 2015 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Dec  6 23:05:49 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52991eee

dev-util/checkstyle: Remove old

Package-Manager: portage-2.2.20.1

 dev-util/checkstyle/Manifest  |  1 -
 dev-util/checkstyle/checkstyle-5.4.ebuild | 83 ---
 2 files changed, 84 deletions(-)

diff --git a/dev-util/checkstyle/Manifest b/dev-util/checkstyle/Manifest
index 1480612..acc6d14 100644
--- a/dev-util/checkstyle/Manifest
+++ b/dev-util/checkstyle/Manifest
@@ -1,4 +1,3 @@
 DIST checkstyle-5.4-maven-build.xml.tar.bz2 3236 SHA256 
4b286857c265b765fcf71deb8684cdd1bb7d1264fd0ee45a924d91031652d590 SHA512 
23cfcb519984fd9d7a59d8534c712d69c02aabc28e9f6eb7abff948728361cc208bf84d19f30dc81ae8870f6b361ca0382be60c4ab7b7b0298e59a175197138e
 WHIRLPOOL 
32992aa00d228be5f0819e856f13752eba9694cf46e98b3c9229c5ef45a7c37c1c6367a1457487ec5ab63f9d808b1470727f44e5b7d194961520a34b55253f72
-DIST checkstyle-5.4-src.tar.gz 731222 SHA256 
2c8b04a914a7835eaa355c058f7a4c52af308f8190d07fb3cbf9943cf751b8a8 SHA512 
4f20fe8c48ea638c3390b07d94a54180663d939dce455b492ae19397ddf81e617f36e9aa4700e88c5081b7369a0e03d0d59bf2ee988325f15565fd66faadb5e6
 WHIRLPOOL 
5cd60912a4acf125c5a44ba35ed60d4e5acd7e48dfcd084195dbe30910d37f42b272f670c0e7f25406fdd95f9befd5c5cd42a27bfd2a7e62c7faa07b2bf612af
 DIST checkstyle-5.5-src.tar.gz 744584 SHA256 
0de571f2769b4ded9c681c9b1e51c7f783aca7fb7f47467f1f39c38bd1717aa1 SHA512 
2327e14fc6fe9516d9518e4cbccb2e0f41e50bf891b7a3655dd29601b5eb3d2895d7df841f394d08d7dfac7ab774a01e22f98226259dc28a210d478699ea5c9a
 WHIRLPOOL 
e29303b656090a2f617850d2edb7f3f41db912399d334d6d8a7f7c50a96c7cfdb8134e46b65cec762ce565b1709de98a870880cdd8e18af03f594b9a2141609a
 DIST checkstyle-src-4.4.tar.gz 2567907 SHA256 
7081074124e2dde062b06cbb489a1338e04623b986094e9b63f31c50be2f9f38 SHA512 
4cce16b70e901bdcee0d3ac864f51cef54965d37223a11e59b7b9d34603b404da0cc8207431481feb5f0e649b5f55a5ef05aebfceeb37f938246f8722867174d
 WHIRLPOOL 
ae3b1f3161caac22235d20b018b035b4bf1e042f5fb930b620b6eae8692a1825fe382649a3d360794a8cb3d48135ea1e3e8597865ed10c0e868d9440e9287240

diff --git a/dev-util/checkstyle/checkstyle-5.4.ebuild 
b/dev-util/checkstyle/checkstyle-5.4.ebuild
deleted file mode 100644
index d96d2ef..000
--- a/dev-util/checkstyle/checkstyle-5.4.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-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;
-SRC_URI="mirror://sourceforge/checkstyle/${P}-src.tar.gz
-   https://dev.gentoo.org/~sera/distfiles/${P}-maven-build.xml.tar.bz2;
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEP="
-   dev-java/ant-core:0
-   >=dev-java/antlr-2.7.7:0[java]
-   dev-java/commons-beanutils:1.7
-   dev-java/commons-cli:1
-   dev-java/commons-logging:0
-   dev-java/guava:0"
-RDEPEND="${COMMON_DEP}
-   >=virtual/jre-1.5"
-DEPEND="${COMMON_DEP}
-   >=virtual/jdk-1.5
-   dev-java/ant-nodeps:0
-   test? (
-   dev-java/ant-junit
-   dev-java/junit:4
-   )"
-
-java_prepare() {
-   EPATCH_OPTS="-p1" epatch "${WORKDIR}"/maven-build.xml.patch
-
-   # 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
-   popd > /dev/null
-}
-
-JAVA_PKG_BSFIX_NAME="maven-build.xml"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-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_BUILD_TARGET="package"
-EANT_ANT_TASKS="ant-nodeps"
-EANT_NEEDS_TOOLS="true"
-
-src_test() {
-   EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-   java-pkg-2_src_test
-}
-
-src_install() {
-   java-pkg_newjar target/${P}.jar
-
-   dodoc README
-   use doc && java-pkg_dojavadoc target/site/apidocs
-   use source && java-pkg_dosrc src/${PN}/com
-
-   # Install check files
-   insinto /usr/share/checkstyle/checks
-   doins suppressions.xml sun_checks.xml import-control.xml 
checkstyle_checks.xml
-
-   # Install extra files
-   insinto  /usr/share/checkstyle/contrib
-   doins -r contrib/*
-
-   java-pkg_dolauncher ${PN} \
-   --main com.puppycrawl.tools.checkstyle.Main
-
-   java-pkg_dolauncher ${PN}-gui \
-   --main

[gentoo-commits] repo/gentoo:master commit in: dev-util/checkstyle/

2015-12-06 Thread James Le Cuirot 
commit: dca533623b0d552edaedc91452ab06656e1ceb43
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Oct 18 14:22:06 2015 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Dec  6 23:05:55 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dca53362

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

 ...heckstyle-5.5.ebuild => checkstyle-5.5-r1.ebuild} | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

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 debd4cc..7a81a42 100644
--- 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"