moved from dev-java/regexp to dev-java/jakarta-regexp dependency. see #71336

(Portage version: 2.0.51.19)

6 files changed, 69 insertions, 8 deletions

diff --git a/dev-util/checkstyle/ChangeLog b/dev-util/checkstyle/ChangeLog
index dec3229e6bd6..87af0c7251aa 100644
--- a/dev-util/checkstyle/ChangeLog
+++ b/dev-util/checkstyle/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/checkstyle
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/checkstyle/ChangeLog,v 1.10 2005/01/14 19:19:29 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/checkstyle/ChangeLog,v 1.11 2005/03/27 21:15:36 luckyduck Exp $
+
+*checkstyle-3.4-r3 (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:
+  moved from dev-java/regexp to dev-java/jakarta-regexp dependency. see #71336
 
   14 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> checkstyle-3.3.ebuild,
   checkstyle-3.4-r2.ebuild:
diff --git a/dev-util/checkstyle/Manifest b/dev-util/checkstyle/Manifest
index 6141a95faa9c..6656a1879521 100644
--- a/dev-util/checkstyle/Manifest
+++ b/dev-util/checkstyle/Manifest
@@ -1,6 +1,8 @@
+MD5 a40d217be4737d6515a41e18a7226b23 checkstyle-3.4-r3.ebuild 2106
+MD5 49e8a4e17a20477031f6a7fed6ac0892 checkstyle-3.3-r1.ebuild 1704
 MD5 4f1d6824c2824d3e9c56c88aec8fc434 checkstyle-3.3.ebuild 1686
-MD5 79f02b9fb3e3b4ca8beb32edd7d218a8 checkstyle-3.4-r2.ebuild 2069
-MD5 1b96733cc39c39d56499b98b89dbea30 ChangeLog 1629
+MD5 a373b401b8896c6005fc4203b6dc9d7a ChangeLog 1878
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 3bfc61fcf1ab108f7cf96aef2c3acd0e files/digest-checkstyle-3.3 71
-MD5 ee7955e25b09c5307250330d16910077 files/digest-checkstyle-3.4-r2 71
+MD5 3bfc61fcf1ab108f7cf96aef2c3acd0e files/digest-checkstyle-3.3-r1 71
+MD5 ee7955e25b09c5307250330d16910077 files/digest-checkstyle-3.4-r3 71
diff --git a/dev-util/checkstyle/checkstyle-3.3-r1.ebuild b/dev-util/checkstyle/checkstyle-3.3-r1.ebuild
new file mode 100644
index 000000000000..fa06e8b6ac7c
--- /dev/null
+++ b/dev-util/checkstyle/checkstyle-3.3-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/checkstyle/checkstyle-3.3-r1.ebuild,v 1.1 2005/03/27 21:15:36 luckyduck 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 ~amd64"
+IUSE="doc jikes"
+
+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/jakarta-regexp-1.3*"
+
+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 && java-pkg_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
+
+	echo '#!/bin/bash' > checkstyle
+	echo '' >> checkstyle
+	echo '`java-config -J` -cp `java-config -p checkstyle,antlr,commons-beanutils,commons-cli-1,commons-collections,commons-logging,jakarta-regexp-1.3` com.puppycrawl.tools.checkstyle.Main "$@"' >> checkstyle
+
+	insinto /usr
+	dobin checkstyle
+}
diff --git a/dev-util/checkstyle/checkstyle-3.4-r2.ebuild b/dev-util/checkstyle/checkstyle-3.4-r3.ebuild
index d3f4113c56a6..5b06c64a7b77 100644
--- a/dev-util/checkstyle/checkstyle-3.4-r2.ebuild
+++ b/dev-util/checkstyle/checkstyle-3.4-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/checkstyle/checkstyle-3.4-r2.ebuild,v 1.5 2005/01/14 19:19:29 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/checkstyle/checkstyle-3.4-r3.ebuild,v 1.1 2005/03/27 21:15:36 luckyduck Exp $
 
 inherit java-pkg
 
@@ -25,7 +25,7 @@ RDEPEND=">=virtual/jre-1.3
 		=dev-java/commons-cli-1*
 		dev-java/commons-collections
 		dev-java/commons-logging
-		>=dev-java/regexp-1.3-r1"
+		=dev-java/jakarta-regexp-1.3*"
 
 src_unpack() {
 	unpack ${A}
@@ -35,7 +35,7 @@ src_unpack() {
 	java-pkg_jar-from commons-cli-1
 	java-pkg_jar-from commons-collections
 	java-pkg_jar-from commons-logging
-	java-pkg_jar-from regexp regexp.jar jakarta-regexp-1.3.jar
+	java-pkg_jar-from jakarta-regexp-1.3 jakarta-regexp.jar jakarta-regexp-1.3.jar
 	#if use junit; then
 	#	java-pkg_jar-from junit
 	#else
@@ -62,7 +62,7 @@ src_install() {
 
 	echo '#!/bin/bash' > checkstyle
 	echo '' >> checkstyle
-	echo '`java-config -J` -cp `java-config -p checkstyle,antlr,commons-beanutils,commons-cli-1,commons-collections,commons-logging,regexp` com.puppycrawl.tools.checkstyle.Main "$@"' >> checkstyle
+	echo '`java-config -J` -cp `java-config -p checkstyle,antlr,commons-beanutils,commons-cli-1,commons-collections,commons-logging,jakarta-regexp-1.3` com.puppycrawl.tools.checkstyle.Main "$@"' >> checkstyle
 
 	insinto /usr
 	dobin checkstyle
diff --git a/dev-util/checkstyle/files/digest-checkstyle-3.3-r1 b/dev-util/checkstyle/files/digest-checkstyle-3.3-r1
new file mode 100644
index 000000000000..e8c6fd42cc1e
--- /dev/null
+++ b/dev-util/checkstyle/files/digest-checkstyle-3.3-r1
@@ -0,0 +1 @@
+MD5 034f31ce020fa35b48882b762b4999b2 checkstyle-src-3.3.tar.gz 1277240
diff --git a/dev-util/checkstyle/files/digest-checkstyle-3.4-r2 b/dev-util/checkstyle/files/digest-checkstyle-3.4-r3
index 8756cf5ecc04..8756cf5ecc04 100644
--- a/dev-util/checkstyle/files/digest-checkstyle-3.4-r2
+++ b/dev-util/checkstyle/files/digest-checkstyle-3.4-r3