named the jar ${PN}.jar to its usable with java-pkg_jar-from

6 files changed, 16 insertions, 59 deletions

diff --git a/dev-util/checkstyle/ChangeLog b/dev-util/checkstyle/ChangeLog
index 3571d128142b..31cdd0819a9e 100644
--- a/dev-util/checkstyle/ChangeLog
+++ b/dev-util/checkstyle/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/checkstyle
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/checkstyle/ChangeLog,v 1.5 2004/09/12 20:03:36 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/checkstyle/ChangeLog,v 1.6 2004/09/17 18:16:13 axxo Exp $
+
+*checkstyle-3.4-r2 (17 Sep 2004)
+
+  17 Sep 2004; Thomas Matthijs <axxo@gentoo.org> -checkstyle-3.4-r1.ebuild,
+  +checkstyle-3.4-r2.ebuild, -checkstyle-3.4.ebuild:
+  named the jar ${PN}.jar to its usable with java-pkg_jar-from
 
 *checkstyle-3.4-r1 (12 Sep 2004)
 
diff --git a/dev-util/checkstyle/Manifest b/dev-util/checkstyle/Manifest
index 583495a7901b..ac38d5f67f51 100644
--- a/dev-util/checkstyle/Manifest
+++ b/dev-util/checkstyle/Manifest
@@ -1,18 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d373a86081726a2e8f8e15fd5c229ade checkstyle-3.4-r1.ebuild 1757
-MD5 670082724fff8fc0675c6b047a102726 checkstyle-3.4.ebuild 1402
 MD5 946d15e4a0e7ee14cd7d065c05128b68 checkstyle-3.3.ebuild 1381
-MD5 11efa6c975cd464e0758817525ef058b ChangeLog 812
+MD5 90aec719fc5cc896d448932696082c09 checkstyle-3.4-r2.ebuild 1759
+MD5 ecb0f5e55cba301a7afb84ad68f7bb68 ChangeLog 1039
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 3bfc61fcf1ab108f7cf96aef2c3acd0e files/digest-checkstyle-3.3 71
-MD5 ee7955e25b09c5307250330d16910077 files/digest-checkstyle-3.4 71
-MD5 ee7955e25b09c5307250330d16910077 files/digest-checkstyle-3.4-r1 71
+MD5 ee7955e25b09c5307250330d16910077 files/digest-checkstyle-3.4-r2 71
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBRKul/rLF9B432nYRAk/VAJ0VR+qbMTfKXmXs57ZZLPu4A88rNwCfeA3P
-p5K6SeNcL7tlPGRbwjuJq2c=
-=Ykie
+iD8DBQFBSyoW/rLF9B432nYRAp76AKCOcIqy3Ao+wogPx84tX0aYGpZxbgCePM0u
+uOosZNyJaFYRRgBGRx4pkJ4=
+=jbM8
 -----END PGP SIGNATURE-----
diff --git a/dev-util/checkstyle/checkstyle-3.4-r1.ebuild b/dev-util/checkstyle/checkstyle-3.4-r2.ebuild
index 0500a341d33c..611f84455f43 100644
--- a/dev-util/checkstyle/checkstyle-3.4-r1.ebuild
+++ b/dev-util/checkstyle/checkstyle-3.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/checkstyle/checkstyle-3.4-r1.ebuild,v 1.1 2004/09/12 20:03:36 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/checkstyle/checkstyle-3.4-r2.ebuild,v 1.1 2004/09/17 18:16:13 axxo Exp $
 
 inherit java-pkg
 
@@ -52,8 +52,8 @@ src_compile() {
 
 src_install() {
 	insinto /usr/share/checkstyle
-	jar cfm ${P}.jar config/manifest.mf -C target/checkstyle .
-	java-pkg_dojar ${P}.jar
+	jar cfm ${PN}.jar config/manifest.mf -C target/checkstyle .
+	java-pkg_dojar ${PN}.jar
 	use doc && dohtml -r docs/*
 	dodoc README RIGHTS.antlr TODO
 	mv docs/checkstyle_checks.xml ${D}/usr/share/checkstyle/checkstyle_checks.xml
diff --git a/dev-util/checkstyle/checkstyle-3.4.ebuild b/dev-util/checkstyle/checkstyle-3.4.ebuild
deleted file mode 100644
index c67d99990d4a..000000000000
--- a/dev-util/checkstyle/checkstyle-3.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/checkstyle/checkstyle-3.4.ebuild,v 1.2 2004/09/04 16:13:07 axxo Exp $
-
-inherit java-pkg
-
-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/${PN}-src-${PV}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86 ~sparc"
-IUSE="doc jikes"
-RESTRICT="nomirror"
-
-S=${WORKDIR}/${PN}-src-${PV}
-
-DEPEND=">=virtual/jdk-1.4
-		>=dev-java/ant-1.5
-		jikes? ( dev-java/jikes )"
-
-RDEPEND=">=virtual/jre-1.3
-		dev-java/antlr
-		dev-java/commons-beanutils
-		dev-java/commons-cli
-		dev-java/commons-collections
-		dev-java/commons-logging
-		>=dev-java/regexp-1.3-r1"
-
-src_compile() {
-	local antflags="compile.checkstyle"
-	use doc && antflags="${antflags} javadoc"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	ant ${antflags} || die "ant :("
-}
-
-src_install() {
-	insinto /usr/share/checkstyle
-	jar cfm ${P}.jar config/manifest.mf -C target/checkstyle .
-	java-pkg_dojar ${P}.jar
-	use doc && dohtml -r docs/*
-	dodoc README RIGHTS.antlr TODO
-	mv docs/checkstyle_checks.xml ${D}/usr/share/checkstyle/checkstyle_checks.xml
-	mv docs/sun_checks.xml ${D}/usr/share/checkstyle/sun_checks.xml
-	mv contrib ${D}/usr/share/checkstyle
-}
diff --git a/dev-util/checkstyle/files/digest-checkstyle-3.4-r1 b/dev-util/checkstyle/files/digest-checkstyle-3.4-r1
deleted file mode 100644
index 8756cf5ecc04..000000000000
--- a/dev-util/checkstyle/files/digest-checkstyle-3.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 39b7e55c7e2103b485e061ab5e42c292 checkstyle-src-3.4.tar.gz 1323474
diff --git a/dev-util/checkstyle/files/digest-checkstyle-3.4 b/dev-util/checkstyle/files/digest-checkstyle-3.4-r2
index 8756cf5ecc04..8756cf5ecc04 100644
--- a/dev-util/checkstyle/files/digest-checkstyle-3.4
+++ b/dev-util/checkstyle/files/digest-checkstyle-3.4-r2