Version bump. Test suite works only with virtual/jdk-1.6.

Package-Manager: portage-2.1.2.4

4 files changed, 134 insertions, 5 deletions

diff --git a/dev-util/checkstyle/ChangeLog b/dev-util/checkstyle/ChangeLog
index f361ff902848..6f221e302373 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.23 2007/02/03 23:01:27 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/checkstyle/ChangeLog,v 1.24 2007/04/23 17:27:20 betelgeuse Exp $
+
+*checkstyle-4.3 (23 Apr 2007)
+
+  23 Apr 2007; Petteri Räty <betelgeuse@gentoo.org> +checkstyle-4.3.ebuild:
+  Version bump. Test suite works only with virtual/jdk-1.6.
 
   03 Feb 2007; Steve Dibb <beandog@gentoo.org> checkstyle-4.2.ebuild:
   add ~amd64, bug 161618
@@ -53,6 +58,7 @@
   cleanup, removed old revision with a dependency to regexp.
 
 *checkstyle-3.4-r3 (27 Mar 2005)
+*checkstyle-3.3-r1 (27 Mar 2005)
 
   27 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> +checkstyle-3.3-r1.ebuild,
   -checkstyle-3.4-r2.ebuild, +checkstyle-3.4-r3.ebuild:
diff --git a/dev-util/checkstyle/Manifest b/dev-util/checkstyle/Manifest
index 7d55bdda8ed3..9abb347e67f7 100644
--- a/dev-util/checkstyle/Manifest
+++ b/dev-util/checkstyle/Manifest
@@ -1,7 +1,11 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST checkstyle-src-3.4.tar.gz 1323474 RMD160 7931d1351e692d0b3fc3a990eded5420dc365795 SHA1 cb79cba81830a424344c6b541f549a328eb08ed6 SHA256 909438e173b61ba989ecb9bd9b80429cfd11e50089c77f19519c45201d21f4c9
 DIST checkstyle-src-3.5.tar.gz 1962069 RMD160 4a62c11b40bb32cb1519e3ef78120d6b0c860c48 SHA1 63f97c153791f6d462d0e3c28a8e0c70cfb3343e SHA256 f72fc6724699c617b544cc9b4925a0e568106c8c445da43775d5451becccf2d2
 DIST checkstyle-src-4.1.tar.gz 2877441 RMD160 70be504829eb9f33affe56bd4b87228a38354683 SHA1 e9daa93193d27acc2f2955671ac8beebef5cd8dd SHA256 0ea1c7fea315a8321a826ccf8e4fa9b12542d79a9d6da5f79def8c77f9e5fddb
 DIST checkstyle-src-4.2.tar.gz 2558813 RMD160 02a248be429700cc27cf17d786dce29ed6e03189 SHA1 e770c8d4add3a0defa1f8591c145d678c088b385 SHA256 9765dfa9f2d8d1780a90f792481d48cb90d671a22ba9be4ad026b9dbf83b0aa1
+DIST checkstyle-src-4.3.tar.gz 2566968 RMD160 476ce17adbf869f17a287c232f9b5c6e9b056266 SHA1 1fdabe5cc3395059fbd26a8efd281b50916d608c SHA256 ba6b106b1ecbe3686687cb8e069d3935a37a58bb1b0e1dfa6af9bf052b093b97
 EBUILD checkstyle-3.4-r4.ebuild 2028 RMD160 0ab76b2cd8aeea9d7346cdaaf292a75e0c23ecb7 SHA1 6c709e128e5c74cda1303050d31f2144a2d99f10 SHA256 a3e8fb9f6e4144056eb9e36f9772e1cda188971dba9f4cb4210e0b85442bc078
 MD5 2b2c13f9eb35f220ba9a196d0a657f62 checkstyle-3.4-r4.ebuild 2028
 RMD160 0ab76b2cd8aeea9d7346cdaaf292a75e0c23ecb7 checkstyle-3.4-r4.ebuild 2028
@@ -18,10 +22,14 @@ EBUILD checkstyle-4.2.ebuild 2445 RMD160 d844f78be5dee00b90a99611f3e494983f3597c
 MD5 aa425f8010ce124692c081e39e753909 checkstyle-4.2.ebuild 2445
 RMD160 d844f78be5dee00b90a99611f3e494983f3597cb checkstyle-4.2.ebuild 2445
 SHA256 0d0c112bc2269ec7aa7ec1495e8d8d3f71ef9bc08ba4197147634e535be629bb checkstyle-4.2.ebuild 2445
-MISC ChangeLog 3596 RMD160 9c2645adc2e483d9da7c7c1141126dc6f81ef7b8 SHA1 389d760fbe1da6b178c0c1d771d23e8accec9125 SHA256 869187fd40a130d32e6c3db8819abed079aba9c89759a6231e2987ac27c22e7c
-MD5 56a1768177aa2394ad7822e01304a5d9 ChangeLog 3596
-RMD160 9c2645adc2e483d9da7c7c1141126dc6f81ef7b8 ChangeLog 3596
-SHA256 869187fd40a130d32e6c3db8819abed079aba9c89759a6231e2987ac27c22e7c ChangeLog 3596
+EBUILD checkstyle-4.3.ebuild 2578 RMD160 11d1e7bd5d73ef10d62d8109c7eca008874ec863 SHA1 230aeeeffcbee7884ad26720b5d51d697872fb43 SHA256 f383a71bdf6f9714d2e7c0ccd7ccbede6adc0468e63a628125e221382208e5ee
+MD5 aab88657b5ab323e7e3fafa465dcc6a6 checkstyle-4.3.ebuild 2578
+RMD160 11d1e7bd5d73ef10d62d8109c7eca008874ec863 checkstyle-4.3.ebuild 2578
+SHA256 f383a71bdf6f9714d2e7c0ccd7ccbede6adc0468e63a628125e221382208e5ee checkstyle-4.3.ebuild 2578
+MISC ChangeLog 3801 RMD160 22cbfe1a041d24ea10ecda964fb1ccf1ad444e9f SHA1 f4c94b253f5d6642642430e85233b066c282fbe4 SHA256 95d0ce6363be3244b853bc3bd6645eaaecb977aaf1f248e52f35096f2c0e69db
+MD5 b9713671b3a684e3338d555b792f3cbe ChangeLog 3801
+RMD160 22cbfe1a041d24ea10ecda964fb1ccf1ad444e9f ChangeLog 3801
+SHA256 95d0ce6363be3244b853bc3bd6645eaaecb977aaf1f248e52f35096f2c0e69db ChangeLog 3801
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -38,3 +46,13 @@ SHA256 28a4dd1294288b27e01bf17969e6c991bf6b61f89cb7243bff9d8895d45b2b93 files/di
 MD5 98d310ffc358c084cbe9f89055ed6061 files/digest-checkstyle-4.2 259
 RMD160 491aaa2a7a19cf152d6444601b4425f4455f7229 files/digest-checkstyle-4.2 259
 SHA256 b3ebba455b75e23834bc91a488d434062190d3768af565351b99fe4afd517218 files/digest-checkstyle-4.2 259
+MD5 3a743f216a6b48033bd60cc891352e27 files/digest-checkstyle-4.3 259
+RMD160 137501f7c7c21836f287c142c5b4513e439dbf71 files/digest-checkstyle-4.3 259
+SHA256 9bb0bdb90fbefa1c3fce08dcb7fac015414ff1bdc3b982a3a2960b3f844dce43 files/digest-checkstyle-4.3 259
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGLOx/cxLzpIGCsLQRAngxAJ9E6BV71SwBOVImgzDMNXvXCj6woQCdGSt1
+xo/ZjFIs3pQOw/wI26NQiCw=
+=39EQ
+-----END PGP SIGNATURE-----
diff --git a/dev-util/checkstyle/checkstyle-4.3.ebuild b/dev-util/checkstyle/checkstyle-4.3.ebuild
new file mode 100644
index 000000000000..70d149525c12
--- /dev/null
+++ b/dev-util/checkstyle/checkstyle-4.3.ebuild
@@ -0,0 +1,102 @@
+# 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.3.ebuild,v 1.1 2007/04/23 17:27:20 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}"
+
+# Tests are a bit buggy and fail with 1.5 in one case
+# Should be fixed in the next release
+DEPEND="!test? ( >=virtual/jdk-1.4 )
+	test? ( =virtual/jdk-1.6* )
+	${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() {
+	# 1.6 on ppc. Remember to remove from package.use.mask when 1.6 is out
+	if use !ppc; then
+		cd "${S}/lib"
+		java-pkg_jar-from --build-only junit
+		java-pkg_jar-from --build-only emma
+		cd "${S}"
+		ANT_TASKS="emma ant-nodeps ant-junit ant-trax" eant run.tests
+	fi
+}
+
+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.3 b/dev-util/checkstyle/files/digest-checkstyle-4.3
new file mode 100644
index 000000000000..d80a7d967ad3
--- /dev/null
+++ b/dev-util/checkstyle/files/digest-checkstyle-4.3
@@ -0,0 +1,3 @@
+MD5 ca03b9f809b578aa98bbd70d0f2cadf1 checkstyle-src-4.3.tar.gz 2566968
+RMD160 476ce17adbf869f17a287c232f9b5c6e9b056266 checkstyle-src-4.3.tar.gz 2566968
+SHA256 ba6b106b1ecbe3686687cb8e069d3935a37a58bb1b0e1dfa6af9bf052b093b97 checkstyle-src-4.3.tar.gz 2566968