From e27d5cc0dac9a36da33dcaba55f011bde10f5a90 Mon Sep 17 00:00:00 2001 From: Jan Brinkmann Date: Sat, 14 May 2005 16:14:02 +0000 Subject: updated commons-beanutils dependency to reflect new slotting. see #71952 (Portage version: 2.0.51.21) --- dev-util/checkstyle/ChangeLog | 9 ++- dev-util/checkstyle/Manifest | 18 +----- dev-util/checkstyle/checkstyle-3.3-r1.ebuild | 52 ---------------- dev-util/checkstyle/checkstyle-3.4-r3.ebuild | 69 ---------------------- dev-util/checkstyle/checkstyle-3.4-r4.ebuild | 64 ++++++++++++++++++++ dev-util/checkstyle/files/digest-checkstyle-3.3-r1 | 1 - dev-util/checkstyle/files/digest-checkstyle-3.4-r3 | 1 - dev-util/checkstyle/files/digest-checkstyle-3.4-r4 | 1 + 8 files changed, 76 insertions(+), 139 deletions(-) delete mode 100644 dev-util/checkstyle/checkstyle-3.3-r1.ebuild delete mode 100644 dev-util/checkstyle/checkstyle-3.4-r3.ebuild create mode 100644 dev-util/checkstyle/checkstyle-3.4-r4.ebuild delete mode 100644 dev-util/checkstyle/files/digest-checkstyle-3.3-r1 delete mode 100644 dev-util/checkstyle/files/digest-checkstyle-3.4-r3 create mode 100644 dev-util/checkstyle/files/digest-checkstyle-3.4-r4 (limited to 'dev-util') diff --git a/dev-util/checkstyle/ChangeLog b/dev-util/checkstyle/ChangeLog index 6454a9750eb9..2e1396e7c2f4 100644 --- a/dev-util/checkstyle/ChangeLog +++ b/dev-util/checkstyle/ChangeLog @@ -1,6 +1,13 @@ # 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.12 2005/04/02 19:46:52 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/checkstyle/ChangeLog,v 1.13 2005/05/14 16:10:54 luckyduck Exp $ + +*checkstyle-3.4-r4 (14 May 2005) + + 14 May 2005; Jan Brinkmann + -checkstyle-3.3-r1.ebuild, -checkstyle-3.4-r3.ebuild, + +checkstyle-3.4-r4.ebuild: + updated commons-beanutils dependency to reflect new slotting. see #71952 02 Apr 2005; Jan Brinkmann checkstyle-3.3-r1.ebuild, -checkstyle-3.3.ebuild: diff --git a/dev-util/checkstyle/Manifest b/dev-util/checkstyle/Manifest index 6d3858e77930..eaf5a46db8df 100644 --- a/dev-util/checkstyle/Manifest +++ b/dev-util/checkstyle/Manifest @@ -1,16 +1,4 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 eb2fe27c4a0ffc2c320ddbd3c745eaad checkstyle-3.4-r3.ebuild 2106 -MD5 0dbe3d55243143e3320df20a75d99a97 checkstyle-3.3-r1.ebuild 1706 -MD5 dbc41a59517c724b23afff6abe275e8e ChangeLog 2044 +MD5 b021d8bed4ba32ff0087c0da99cfb2ec ChangeLog 2291 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 -MD5 3bfc61fcf1ab108f7cf96aef2c3acd0e files/digest-checkstyle-3.3-r1 71 -MD5 ee7955e25b09c5307250330d16910077 files/digest-checkstyle-3.4-r3 71 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.0 (GNU/Linux) - -iD8DBQFCTvbC06ebR+OMO78RAkEkAJwKVvBsmFOhHhlI2FVEv/GsWzmecwCdEsD7 -nt2SivqNLnOEuOczeIF94Rw= -=1zzZ ------END PGP SIGNATURE----- +MD5 ff9ae8ca73b726b4301ab188af700794 checkstyle-3.4-r4.ebuild 2056 +MD5 ee7955e25b09c5307250330d16910077 files/digest-checkstyle-3.4-r4 71 diff --git a/dev-util/checkstyle/checkstyle-3.3-r1.ebuild b/dev-util/checkstyle/checkstyle-3.3-r1.ebuild deleted file mode 100644 index ed4cd2e55041..000000000000 --- a/dev-util/checkstyle/checkstyle-3.3-r1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# 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.2 2005/04/02 19:46:52 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-r3.ebuild b/dev-util/checkstyle/checkstyle-3.4-r3.ebuild deleted file mode 100644 index 5b06c64a7b77..000000000000 --- a/dev-util/checkstyle/checkstyle-3.4-r3.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# 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-r3.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 ~ppc ~amd64" -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-1* - dev-java/commons-collections - dev-java/commons-logging - =dev-java/jakarta-regexp-1.3*" - -src_unpack() { - unpack ${A} - cd ${S}/lib - java-pkg_jar-from antlr - java-pkg_jar-from commons-beanutils - java-pkg_jar-from commons-cli-1 - java-pkg_jar-from commons-collections - java-pkg_jar-from commons-logging - 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 - rm junit.jar - #fi -} - -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 ${PN}.jar config/manifest.mf -C target/checkstyle . - java-pkg_dojar ${PN}.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-r4.ebuild b/dev-util/checkstyle/checkstyle-3.4-r4.ebuild new file mode 100644 index 000000000000..e4559dde335d --- /dev/null +++ b/dev-util/checkstyle/checkstyle-3.4-r4.ebuild @@ -0,0 +1,64 @@ +# 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-r4.ebuild,v 1.1 2005/05/14 16:10:54 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 ppc amd64" +IUSE="doc jikes" +RESTRICT="primaryuri" + +DEPEND=">=virtual/jdk-1.4 + dev-java/ant-core + jikes? ( dev-java/jikes )" +RDEPEND=">=virtual/jre-1.3 + dev-java/antlr + =dev-java/commons-beanutils-1.6* + =dev-java/commons-cli-1* + dev-java/commons-collections + dev-java/commons-logging + =dev-java/jakarta-regexp-1.3*" +S=${WORKDIR}/${PN}-src-${PV} + +src_unpack() { + unpack ${A} + cd ${S}/lib + java-pkg_jar-from antlr + java-pkg_jar-from commons-beanutils-1.6 + java-pkg_jar-from commons-cli-1 + java-pkg_jar-from commons-collections + java-pkg_jar-from commons-logging + java-pkg_jar-from jakarta-regexp-1.3 jakarta-regexp.jar jakarta-regexp-1.3.jar + rm junit.jar +} + +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 ${PN}.jar config/manifest.mf -C target/checkstyle . + java-pkg_dojar ${PN}.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-1.6,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 deleted file mode 100644 index e8c6fd42cc1e..000000000000 --- a/dev-util/checkstyle/files/digest-checkstyle-3.3-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 034f31ce020fa35b48882b762b4999b2 checkstyle-src-3.3.tar.gz 1277240 diff --git a/dev-util/checkstyle/files/digest-checkstyle-3.4-r3 b/dev-util/checkstyle/files/digest-checkstyle-3.4-r3 deleted file mode 100644 index 8756cf5ecc04..000000000000 --- a/dev-util/checkstyle/files/digest-checkstyle-3.4-r3 +++ /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-r4 b/dev-util/checkstyle/files/digest-checkstyle-3.4-r4 new file mode 100644 index 000000000000..8756cf5ecc04 --- /dev/null +++ b/dev-util/checkstyle/files/digest-checkstyle-3.4-r4 @@ -0,0 +1 @@ +MD5 39b7e55c7e2103b485e061ab5e42c292 checkstyle-src-3.4.tar.gz 1323474 -- cgit v1.2.3-65-gdbad