Version bump. Tests now work with 1.5.

Package-Manager: portage-2.1.4_rc11

4 files changed, 119 insertions, 8 deletions

diff --git a/dev-util/checkstyle/ChangeLog b/dev-util/checkstyle/ChangeLog
index e228ccf76cf4..9243330361e9 100644
--- a/dev-util/checkstyle/ChangeLog
+++ b/dev-util/checkstyle/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/checkstyle
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/checkstyle/ChangeLog,v 1.34 2007/12/19 16:26:16 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/checkstyle/ChangeLog,v 1.35 2007/12/29 02:35:54 betelgeuse Exp $
+
+*checkstyle-4.4 (29 Dec 2007)
+
+  29 Dec 2007; Petteri Räty <betelgeuse@gentoo.org> +checkstyle-4.4.ebuild:
+  Version bump. Tests now work with 1.5.
 
   19 Dec 2007; Petteri Räty <betelgeuse@gentoo.org> -checkstyle-4.2.ebuild:
   Remove old version.
diff --git a/dev-util/checkstyle/Manifest b/dev-util/checkstyle/Manifest
index 1c701da76a7b..5fa2a6033fae 100644
--- a/dev-util/checkstyle/Manifest
+++ b/dev-util/checkstyle/Manifest
@@ -2,14 +2,19 @@
 Hash: SHA1
 
 DIST checkstyle-src-4.3.tar.gz 2566968 RMD160 476ce17adbf869f17a287c232f9b5c6e9b056266 SHA1 1fdabe5cc3395059fbd26a8efd281b50916d608c SHA256 ba6b106b1ecbe3686687cb8e069d3935a37a58bb1b0e1dfa6af9bf052b093b97
+DIST checkstyle-src-4.4.tar.gz 2567907 RMD160 5d565d158cd88ec884fed37e6fbec8deb5661c58 SHA1 a5c7f9e57021c09ae32c399ca22ab49f03224d75 SHA256 7081074124e2dde062b06cbb489a1338e04623b986094e9b63f31c50be2f9f38
 EBUILD checkstyle-4.3.ebuild 2571 RMD160 414f02a965255d1c05786f79150357676f8e02ca SHA1 96a385dd14ee19dd12feb08ace91632848338579 SHA256 0d6fe983e0d31038dd7031c348a9fd54a62fd4a9c7e1223ebe14a408afa236de
 MD5 86e2db5a6709cafecbaac97e2ff7f1d3 checkstyle-4.3.ebuild 2571
 RMD160 414f02a965255d1c05786f79150357676f8e02ca checkstyle-4.3.ebuild 2571
 SHA256 0d6fe983e0d31038dd7031c348a9fd54a62fd4a9c7e1223ebe14a408afa236de checkstyle-4.3.ebuild 2571
-MISC ChangeLog 4920 RMD160 e590023a2f762e7cbd4d2bbb914642c4c2b48e2d SHA1 13f3fbeee3d7326645cabafec17b832fcd6b7392 SHA256 ada46d7252a77532c45358ebe6eba442fcceb7513d918b735f05e63c92c452f9
-MD5 e356572c8b1c272b341f65c89c9e8037 ChangeLog 4920
-RMD160 e590023a2f762e7cbd4d2bbb914642c4c2b48e2d ChangeLog 4920
-SHA256 ada46d7252a77532c45358ebe6eba442fcceb7513d918b735f05e63c92c452f9 ChangeLog 4920
+EBUILD checkstyle-4.4.ebuild 2382 RMD160 d137f559f79c4a4cf50fc1816316fbdf2f068ad1 SHA1 f388ecee0892d32a9c712e66d818dd72dbb969da SHA256 176e3e2934d938843b503c3d9c816aee156f25d9141dbddd6c1ddf377a515fe6
+MD5 c09daf1ef83201c37c37c88449f8c1c8 checkstyle-4.4.ebuild 2382
+RMD160 d137f559f79c4a4cf50fc1816316fbdf2f068ad1 checkstyle-4.4.ebuild 2382
+SHA256 176e3e2934d938843b503c3d9c816aee156f25d9141dbddd6c1ddf377a515fe6 checkstyle-4.4.ebuild 2382
+MISC ChangeLog 5070 RMD160 c161eb6abfad07856fba9edc3cdcd4b03f97accd SHA1 1e0b8f4633c2dd5b17ffc738a5d7f6b97f41ac5b SHA256 793e9298b07e04fb722bdec5edc199a4a256594205e20b9c0ff0251091487a8c
+MD5 e917b3bfd97a0f1f240992648b3a0e77 ChangeLog 5070
+RMD160 c161eb6abfad07856fba9edc3cdcd4b03f97accd ChangeLog 5070
+SHA256 793e9298b07e04fb722bdec5edc199a4a256594205e20b9c0ff0251091487a8c ChangeLog 5070
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -17,10 +22,13 @@ SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata
 MD5 3a743f216a6b48033bd60cc891352e27 files/digest-checkstyle-4.3 259
 RMD160 137501f7c7c21836f287c142c5b4513e439dbf71 files/digest-checkstyle-4.3 259
 SHA256 9bb0bdb90fbefa1c3fce08dcb7fac015414ff1bdc3b982a3a2960b3f844dce43 files/digest-checkstyle-4.3 259
+MD5 a16e921ad557a7aae3794272abf64075 files/digest-checkstyle-4.4 259
+RMD160 ef1eef5ef692eb7cc0a0039cd2439a8416f1fe45 files/digest-checkstyle-4.4 259
+SHA256 dbb2f5b2f6b83091fa0ccb39c6ba8811c7c8106fa01f74faa097f2cf98250e19 files/digest-checkstyle-4.4 259
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHaUWycxLzpIGCsLQRAuN0AJ0QU+GMo0G6LtqPVccXrQqc7/EVyQCfRoeX
-laq5geCKgL2DSv74R9TzO6c=
-=5uKR
+iD8DBQFHdbKRcxLzpIGCsLQRAoFoAJ9PBhB206SdCQ9RdiBDQ5djHCCouQCfVdG6
+06IzHnB50WkPu1CCX1ztdLo=
+=9K3t
 -----END PGP SIGNATURE-----
diff --git a/dev-util/checkstyle/checkstyle-4.4.ebuild b/dev-util/checkstyle/checkstyle-4.4.ebuild
new file mode 100644
index 000000000000..2116d404ec18
--- /dev/null
+++ b/dev-util/checkstyle/checkstyle-4.4.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/checkstyle/checkstyle-4.4.ebuild,v 1.1 2007/12/29 02:35:54 betelgeuse Exp $
+
+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"
+
+COMMON_DEP="dev-java/antlr
+	=dev-java/commons-beanutils-1.7*
+	=dev-java/commons-cli-1*
+	dev-java/commons-logging
+	dev-java/commons-collections"
+
+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
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+# So that we can generate 1.4 bytecode for dist
+# and 1.5 for tests
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack ${A}
+	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/"
+}
diff --git a/dev-util/checkstyle/files/digest-checkstyle-4.4 b/dev-util/checkstyle/files/digest-checkstyle-4.4
new file mode 100644
index 000000000000..1ec4cd5139f1
--- /dev/null
+++ b/dev-util/checkstyle/files/digest-checkstyle-4.4
@@ -0,0 +1,3 @@
+MD5 bd2e832004cd3af1af19437ec561bea5 checkstyle-src-4.4.tar.gz 2567907
+RMD160 5d565d158cd88ec884fed37e6fbec8deb5661c58 checkstyle-src-4.4.tar.gz 2567907
+SHA256 7081074124e2dde062b06cbb489a1338e04623b986094e9b63f31c50be2f9f38 checkstyle-src-4.4.tar.gz 2567907