Cleanup and use slot deps.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 18 insertions, 116 deletions

diff --git a/dev-util/checkstyle/ChangeLog b/dev-util/checkstyle/ChangeLog
index eafdce8106a5..22c356032a30 100644
--- a/dev-util/checkstyle/ChangeLog
+++ b/dev-util/checkstyle/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/checkstyle
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/checkstyle/ChangeLog,v 1.38 2008/03/10 21:59:21 ken69267 Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/checkstyle/ChangeLog,v 1.39 2009/02/15 18:24:16 caster Exp $
+
+  15 Feb 2009; Vlastimil Babka <caster@gentoo.org> -checkstyle-4.3.ebuild,
+  checkstyle-4.4.ebuild:
+  Cleanup and use slot deps.
 
   10 Mar 2008; Kenneth Prugh <ken69267@gentoo.org> checkstyle-4.4.ebuild:
   amd64 stable, bug #212666
diff --git a/dev-util/checkstyle/Manifest b/dev-util/checkstyle/Manifest
index 2cd7b04ce7f3..ad41f0dcf1ae 100644
--- a/dev-util/checkstyle/Manifest
+++ b/dev-util/checkstyle/Manifest
@@ -1,6 +1,4 @@
-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
-EBUILD checkstyle-4.4.ebuild 2377 RMD160 50e58ffa27b357501fa696be232c9623d46a75db SHA1 c5ad1736d5b99e52124005a2265b32ea2d7768d4 SHA256 3b21c18a9f2c8ce4a5506d3187ef07f29a9faf900652b34c8b64141cc1615f6f
-MISC ChangeLog 5380 RMD160 73cf9dbda3befa7a45996df551f191cb07a54818 SHA1 b0cadd0ec9c4565a52dd7c01a6b9ac5c7b3171c7 SHA256 b89e540e583aa4bf4cff1832b729228099c37e1295083f3e07a55585fb865cdf
+EBUILD checkstyle-4.4.ebuild 2394 RMD160 71a1adde38e8b658f873c38ac6825c9c0bbb6b62 SHA1 fced0d9d65d139150a6c021cb43d2f29e31a88d6 SHA256 97f8297d3117571f64aa315df68edf7bc5b42873db3bb664ede44b3221fbefe5
+MISC ChangeLog 5508 RMD160 2d16d922d8d3b612d5840e5d8bc515f13e99fe5e SHA1 597fa77172eaebdf216520fb990ea0ff5053bad0 SHA256 42f87ff831f84c8c2b3f29d054e753b71aec0a76f4fb94e0c648925a14e84e9e
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
diff --git a/dev-util/checkstyle/checkstyle-4.3.ebuild b/dev-util/checkstyle/checkstyle-4.3.ebuild
deleted file mode 100644
index 0eb284101ceb..000000000000
--- a/dev-util/checkstyle/checkstyle-4.3.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# 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.4 2007/11/25 15:52:01 ranger 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/checkstyle-4.4.ebuild b/dev-util/checkstyle/checkstyle-4.4.ebuild
index ee81177fee2b..5a130aa3cac3 100644
--- a/dev-util/checkstyle/checkstyle-4.4.ebuild
+++ b/dev-util/checkstyle/checkstyle-4.4.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.4 2008/03/10 21:59:21 ken69267 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/checkstyle/checkstyle-4.4.ebuild,v 1.5 2009/02/15 18:24:16 caster Exp $
 
+EAPI=1
 WANT_ANT_TASKS="ant-antlr ant-nodeps"
 JAVA_PKG_IUSE="doc source test"
 
@@ -15,12 +16,13 @@ SRC_URI="mirror://sourceforge/checkstyle/${MY_P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
+IUSE=""
 
-COMMON_DEP="dev-java/antlr
-	=dev-java/commons-beanutils-1.7*
-	=dev-java/commons-cli-1*
-	dev-java/commons-logging
-	dev-java/commons-collections"
+COMMON_DEP="dev-java/antlr:0
+	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}"
@@ -31,7 +33,7 @@ DEPEND="!test? ( >=virtual/jdk-1.4 )
 	test? (
 		dev-java/ant-junit
 		dev-java/ant-trax
-		dev-java/emma
+		dev-java/emma:0
 	)"
 
 S="${WORKDIR}/${MY_P}"