Cleanup and use slot deps.

(Portage version: 2.2_rc23/cvs/Linux x86_64)

3 files changed, 16 insertions, 112 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/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}"