Version bump using generation 2. Added source use flag and src_test support. Should...

Package-Manager: portage-2.1.2_rc4-r7

diff --git a/dev-util/checkstyle/ChangeLog b/dev-util/checkstyle/ChangeLog
index 99b86514f0e520dfe592c1efcf50e9fcb12acab4..7f99934c72a5bd210e2f5f5e764a8aa3337be1ee 100644 (file)
--- a/dev-util/checkstyle/ChangeLog
+++ b/dev-util/checkstyle/ChangeLog
@@ -1,6 +1,12 @@
 # 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.20 2007/01/09 15:34:36 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/checkstyle/ChangeLog,v 1.21 2007/01/11 20:38:42 betelgeuse Exp $
+
+*checkstyle-4.2 (12 Jan 2007)
+
+  12 Jan 2007; Petteri Räty <betelgeuse@gentoo.org> +checkstyle-4.2.ebuild:
+  Version bump using generation 2. Added source use flag and src_test support.
+  Should fix bug #140831.
 
   09 Jan 2007; Vlastimil Babka <caster@gentoo.org> checkstyle-4.1.ebuild:
   Convert einfo to elog.

diff --git a/dev-util/checkstyle/Manifest b/dev-util/checkstyle/Manifest
index db5abbde7ff8294920a33fb008b53399d6121661..cafb11d91a2a470226d2570977183c122fc979e3 100644 (file)
--- a/dev-util/checkstyle/Manifest
+++ b/dev-util/checkstyle/Manifest
@@ -1,6 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST checkstyle-src-3.4.tar.gz 1323474
-DIST checkstyle-src-3.5.tar.gz 1962069
-DIST checkstyle-src-4.1.tar.gz 2877441
+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
 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
@@ -13,10 +17,14 @@ EBUILD checkstyle-4.1.ebuild 2373 RMD160 4d63194d7d3cc7f2a152e3ad94a6d54a0f06168
 MD5 829975154ba08e8a5beb9a2682ef3e12 checkstyle-4.1.ebuild 2373
 RMD160 4d63194d7d3cc7f2a152e3ad94a6d54a0f06168a checkstyle-4.1.ebuild 2373
 SHA256 0f69d1dd165e833cfb98cd632dde1a9572db22e28e3e32691cfcfbb2a21b1590 checkstyle-4.1.ebuild 2373
-MISC ChangeLog 3179 RMD160 f9ab2508bb90952571904a24de894a7bf4dc38f6 SHA1 f74cad6db9ea37862ce29ae411b3e6ccd1a8bdd8 SHA256 125491eda0384147de94fc6bf889ff91ef7d6749e3e07b240cab00174cc74d18
-MD5 5250a34f7650c8f380841493f60e0225 ChangeLog 3179
-RMD160 f9ab2508bb90952571904a24de894a7bf4dc38f6 ChangeLog 3179
-SHA256 125491eda0384147de94fc6bf889ff91ef7d6749e3e07b240cab00174cc74d18 ChangeLog 3179
+EBUILD checkstyle-4.2.ebuild 2458 RMD160 c9433e5a204d5f5f8f2e9e4ac770067c08db40dc SHA1 afc766a9d05fb471ded67fdbb8e326f6ad5befee SHA256 f8eeee44a3a616520cca8d598aa1e7c6932aecb57a552ae6a15414ef4cba8c2a
+MD5 d4694040aef5c643a4fa4d09e59bb762 checkstyle-4.2.ebuild 2458
+RMD160 c9433e5a204d5f5f8f2e9e4ac770067c08db40dc checkstyle-4.2.ebuild 2458
+SHA256 f8eeee44a3a616520cca8d598aa1e7c6932aecb57a552ae6a15414ef4cba8c2a checkstyle-4.2.ebuild 2458
+MISC ChangeLog 3397 RMD160 73da07ec36a285dd3cd91929b171504bccaf8aef SHA1 7b9e70b09254653aee9a37732967a9f8a1df9da3 SHA256 00e2161f8ab2b6cf4f3e9f3c1d2834c67622a5c26501ff5591cc4cf24a5a3012
+MD5 ee3389f027e3833c371e50eff9c6f3b9 ChangeLog 3397
+RMD160 73da07ec36a285dd3cd91929b171504bccaf8aef ChangeLog 3397
+SHA256 00e2161f8ab2b6cf4f3e9f3c1d2834c67622a5c26501ff5591cc4cf24a5a3012 ChangeLog 3397
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -24,9 +32,19 @@ SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata
 MD5 ee7955e25b09c5307250330d16910077 files/digest-checkstyle-3.4-r4 71
 RMD160 51a3087473366fce29f6ec8167e71fa343602a71 files/digest-checkstyle-3.4-r4 71
 SHA256 f863e2af3648805f2b2101170c7441720c59b7e2fc9256e2ff9b9c6a5b284ca0 files/digest-checkstyle-3.4-r4 71
-MD5 33db541757525575ba7e6d18913875f1 files/digest-checkstyle-3.5 71
-RMD160 ae8aea4c347bd154a65a4277a505d77ccc965945 files/digest-checkstyle-3.5 71
-SHA256 bfcb170839871bf560941262a9b74bc27d7c6c50a7a3da1fe75ef0efc26c4d54 files/digest-checkstyle-3.5 71
-MD5 3183a4b489590ca780b18277ded5a526 files/digest-checkstyle-4.1 71
-RMD160 f6eaddf31b34971fe72e76beca26a4460ab0ce0f files/digest-checkstyle-4.1 71
-SHA256 f32658fd0cb6a3ef12adf3467df59eac56f797d777b2ac61bddea23ca22858b7 files/digest-checkstyle-4.1 71
+MD5 845b472e0b336725f3e5943f829dac63 files/digest-checkstyle-3.5 259
+RMD160 f4a584df2e39b24139b8f43e11e619b4dccf0044 files/digest-checkstyle-3.5 259
+SHA256 e4e1ac33f7efce4b97f001e223ef02c91db80e48c8c1a7eb05b2a8c7bda5317b files/digest-checkstyle-3.5 259
+MD5 34b0bd5d7b52eb5f05e23075d162c4ed files/digest-checkstyle-4.1 259
+RMD160 25b97f2deb9d0efa5ace2184b162c226f86a1dee files/digest-checkstyle-4.1 259
+SHA256 28a4dd1294288b27e01bf17969e6c991bf6b61f89cb7243bff9d8895d45b2b93 files/digest-checkstyle-4.1 259
+MD5 98d310ffc358c084cbe9f89055ed6061 files/digest-checkstyle-4.2 259
+RMD160 491aaa2a7a19cf152d6444601b4425f4455f7229 files/digest-checkstyle-4.2 259
+SHA256 b3ebba455b75e23834bc91a488d434062190d3768af565351b99fe4afd517218 files/digest-checkstyle-4.2 259
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFFpvTWcxLzpIGCsLQRAt2tAJwOCXFwsjyG99ZrASsRTUm9HcnFJgCcDmQC
+EuVJXGEGI3iXd3fGOzf8+S0=
+=TdRW
+-----END PGP SIGNATURE-----

diff --git a/dev-util/checkstyle/checkstyle-4.2.ebuild b/dev-util/checkstyle/checkstyle-4.2.ebuild
new file mode 100644 (file)
index 0000000..0d39073
--- /dev/null
+++ b/dev-util/checkstyle/checkstyle-4.2.ebuild
@@ -0,0 +1,97 @@
+# 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.2.ebuild,v 1.1 2007/01/11 20:38:42 betelgeuse Exp $
+
+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="~x86"
+IUSE="doc source test"
+
+COMMON_DEP="
+               dev-java/antlr
+               =dev-java/commons-beanutils-1.7*
+               =dev-java/commons-cli-1*
+               dev-java/commons-logging"
+
+RDEPEND="
+               !test? ( >=virtual/jre-1.4 )
+               test? ( >=virtual/jre-1.5 )
+               ${COMMON_DEP}"
+
+# Uses antlr and as such needs ant-tasks
+# Tests only pass with 1.5 but I think that
+# is a problem with the test classes so running
+# with 1.6 should be fine
+DEPEND="
+               !test? ( >=virtual/jdk-1.4 )
+               test? ( =virtual/jdk-1.5* )
+               ${COMMON_DEP}
+               dev-java/ant-core
+               dev-java/ant-tasks
+               test? (
+                       dev-java/junit
+                       dev-java/emma
+               )"
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+       unpack ${A}
+       cd ${S}/lib
+       rm *.jar
+       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
+}
+
+src_compile() {
+       eant compile.checkstyle $(use_doc)
+       jar cfm ${PN}.jar config/manifest.mf -C target/checkstyle . || die "jar failed"
+}
+
+src_test() {
+       cd "${S}/lib"
+       java-pkg_jar-from --build-only junit
+       # for some weird classpath interactions both seem to be needed
+       java-pkg_jar-from --build-only emma
+       cd "${S}"
+       local cp=$(java-pkg_getjar --build-only emma emma.jar)
+       eant run.tests -lib "${cp}"
+}
+
+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
+
+       # Make the ant tasks available to ant
+       dodir /usr/share/ant-core/lib
+       dosym /usr/share/${PN}/lib/${PN}.jar /usr/share/ant-core/lib/
+}
+
+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-3.5 b/dev-util/checkstyle/files/digest-checkstyle-3.5
index 7868b2be80294de168c5178227f3c4c5ad65e65e..80f6450ca642baa51306cc2d6604b1fbd3a6b99d 100644 (file)
--- a/dev-util/checkstyle/files/digest-checkstyle-3.5
+++ b/dev-util/checkstyle/files/digest-checkstyle-3.5
@@ -1 +1,3 @@
 MD5 868736a6617d58bbc4efcf85984423fd checkstyle-src-3.5.tar.gz 1962069
+RMD160 4a62c11b40bb32cb1519e3ef78120d6b0c860c48 checkstyle-src-3.5.tar.gz 1962069
+SHA256 f72fc6724699c617b544cc9b4925a0e568106c8c445da43775d5451becccf2d2 checkstyle-src-3.5.tar.gz 1962069

diff --git a/dev-util/checkstyle/files/digest-checkstyle-4.1 b/dev-util/checkstyle/files/digest-checkstyle-4.1
index bababbc30bb3b91b78fcf6caa96edd48d23ad5e1..d3be6a690f8b938982b53720020f178db8b1bf96 100644 (file)
--- a/dev-util/checkstyle/files/digest-checkstyle-4.1
+++ b/dev-util/checkstyle/files/digest-checkstyle-4.1
@@ -1 +1,3 @@
 MD5 96b430fe5087b4f62fa78804475ee2ea checkstyle-src-4.1.tar.gz 2877441
+RMD160 70be504829eb9f33affe56bd4b87228a38354683 checkstyle-src-4.1.tar.gz 2877441
+SHA256 0ea1c7fea315a8321a826ccf8e4fa9b12542d79a9d6da5f79def8c77f9e5fddb checkstyle-src-4.1.tar.gz 2877441

diff --git a/dev-util/checkstyle/files/digest-checkstyle-4.2 b/dev-util/checkstyle/files/digest-checkstyle-4.2
new file mode 100644 (file)
index 0000000..413e54f
--- /dev/null
+++ b/dev-util/checkstyle/files/digest-checkstyle-4.2
@@ -0,0 +1,3 @@
+MD5 c75e395b2cf7dc103f4a23bcd15dc545 checkstyle-src-4.2.tar.gz 2558813
+RMD160 02a248be429700cc27cf17d786dce29ed6e03189 checkstyle-src-4.2.tar.gz 2558813
+SHA256 9765dfa9f2d8d1780a90f792481d48cb90d671a22ba9be4ad026b9dbf83b0aa1 checkstyle-src-4.2.tar.gz 2558813