diff options
| author |   Thomas Matthijs <axxo@gentoo.org> | 2005-07-18 18:30:31 +0000 |
|---|---|---|
| committer | Thomas Matthijs <axxo@gentoo.org> | 2005-07-18 18:30:31 +0000 |
| commit | 4c6f092ad67c45621c88787ae446d0c3f8b89de2 (patch) | |
| tree | b305389239d95b32ae11f9c99b01f559bbde400a /dev-util/checkstyle | |
| parent | Updated to work with USE=qt on ppc-macos (diff) | |
| download | gentoo-2-4c6f092ad67c45621c88787ae446d0c3f8b89de2.tar.gz gentoo-2-4c6f092ad67c45621c88787ae446d0c3f8b89de2.tar.bz2 gentoo-2-4c6f092ad67c45621c88787ae446d0c3f8b89de2.zip | |
dep/style fixes
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'dev-util/checkstyle')
| -rw-r--r-- | dev-util/checkstyle/checkstyle-3.4-r4.ebuild | 16 | ||||
| -rw-r--r-- | dev-util/checkstyle/checkstyle-3.5.ebuild | 14 |
2 files changed, 15 insertions, 15 deletions
diff --git a/dev-util/checkstyle/checkstyle-3.4-r4.ebuild b/dev-util/checkstyle/checkstyle-3.4-r4.ebuild index e4559dde335d..47af815f8a0d 100644 --- a/dev-util/checkstyle/checkstyle-3.4-r4.ebuild +++ b/dev-util/checkstyle/checkstyle-3.4-r4.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-r4.ebuild,v 1.1 2005/05/14 16:10:54 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/checkstyle/checkstyle-3.4-r4.ebuild,v 1.2 2005/07/18 18:30:31 axxo Exp $ inherit java-pkg @@ -10,13 +10,10 @@ SRC_URI="mirror://sourceforge/checkstyle/${PN}-src-${PV}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="x86 ~sparc ppc amd64" +KEYWORDS="amd64 ppc ~sparc x86" 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* @@ -24,18 +21,22 @@ RDEPEND=">=virtual/jre-1.3 dev-java/commons-collections dev-java/commons-logging =dev-java/jakarta-regexp-1.3*" +DEPEND=">=virtual/jdk-1.4 + ${RDEPEND} + dev-java/ant-core + jikes? ( dev-java/jikes )" S=${WORKDIR}/${PN}-src-${PV} src_unpack() { unpack ${A} cd ${S}/lib + rm *.jar 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() { @@ -47,7 +48,7 @@ src_compile() { src_install() { insinto /usr/share/checkstyle - jar cfm ${PN}.jar config/manifest.mf -C target/checkstyle . + jar cfm ${PN}.jar config/manifest.mf -C target/checkstyle . || die java-pkg_dojar ${PN}.jar use doc && java-pkg_dohtml -r docs/* dodoc README RIGHTS.antlr TODO @@ -59,6 +60,5 @@ src_install() { 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/checkstyle-3.5.ebuild b/dev-util/checkstyle/checkstyle-3.5.ebuild index d80faf44dde1..c4db526b2c66 100644 --- a/dev-util/checkstyle/checkstyle-3.5.ebuild +++ b/dev-util/checkstyle/checkstyle-3.5.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.5.ebuild,v 1.1 2005/06/29 17:39:27 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/checkstyle/checkstyle-3.5.ebuild,v 1.2 2005/07/18 18:30:31 axxo Exp $ inherit java-pkg @@ -10,13 +10,10 @@ SRC_URI="mirror://sourceforge/checkstyle/${PN}-src-${PV}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" +KEYWORDS="~amd64 ~ppc ~sparc x86" 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* @@ -24,6 +21,10 @@ RDEPEND=">=virtual/jre-1.3 dev-java/commons-collections dev-java/commons-logging =dev-java/jakarta-regexp-1.3*" +DEPEND=">=virtual/jdk-1.4 + ${RDEPEND} + dev-java/ant-core + jikes? ( dev-java/jikes )" S=${WORKDIR}/${PN}-src-${PV} src_unpack() { @@ -47,7 +48,7 @@ src_compile() { src_install() { insinto /usr/share/checkstyle - jar cfm ${PN}.jar config/manifest.mf -C target/checkstyle . + jar cfm ${PN}.jar config/manifest.mf -C target/checkstyle . || die java-pkg_dojar ${PN}.jar use doc && java-pkg_dohtml -r docs/* dodoc README RIGHTS.antlr TODO @@ -59,7 +60,6 @@ src_install() { 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 dodir /usr/share/ant-core/lib |