summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Matthijs <axxo@gentoo.org>2005-07-18 18:30:31 +0000
committerThomas Matthijs <axxo@gentoo.org>2005-07-18 18:30:31 +0000
commitc340c37b9e0e4b131953ccb26157269391703eb6 (patch)
treeabb439be8ad9dba4d5cca058838911b192a43d5f /dev-util/checkstyle
parentUpdated to work with USE=qt on ppc-macos (diff)
downloadhistorical-c340c37b9e0e4b131953ccb26157269391703eb6.tar.gz
historical-c340c37b9e0e4b131953ccb26157269391703eb6.tar.bz2
historical-c340c37b9e0e4b131953ccb26157269391703eb6.zip
dep/style fixes
Package-Manager: portage-2.0.51.22-r1
Diffstat (limited to 'dev-util/checkstyle')
-rw-r--r--dev-util/checkstyle/Manifest10
-rw-r--r--dev-util/checkstyle/checkstyle-3.4-r4.ebuild16
-rw-r--r--dev-util/checkstyle/checkstyle-3.5.ebuild14
3 files changed, 20 insertions, 20 deletions
diff --git a/dev-util/checkstyle/Manifest b/dev-util/checkstyle/Manifest
index df7412cecf22..8f97001b1d2f 100644
--- a/dev-util/checkstyle/Manifest
+++ b/dev-util/checkstyle/Manifest
@@ -1,16 +1,16 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-MD5 c12084de68604616a3369c233569d3a7 checkstyle-3.5.ebuild 2142
+MD5 1deabf41f82e223e04ab66a9c66cfb24 checkstyle-3.5.ebuild 2147
MD5 f2928639e4a802b8de0c3b0c3367cbe8 ChangeLog 2487
MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 ea373f431692187a1d73f569c261c35e checkstyle-3.4-r4.ebuild 2056
+MD5 d666aa7ac04fd90530d86b6543046db3 checkstyle-3.4-r4.ebuild 2053
MD5 33db541757525575ba7e6d18913875f1 files/digest-checkstyle-3.5 71
MD5 ee7955e25b09c5307250330d16910077 files/digest-checkstyle-3.4-r4 71
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
-iD8DBQFCwtzp/rLF9B432nYRAvggAJ97+N2nU5WE6qwGmuUPKNQkPO3mnACgvWga
-8hr80pJzXFpiXtdRczWWQqc=
-=GrU/
+iD8DBQFC2/Vh/rLF9B432nYRAsgTAJ9jnmvc/R1abC3g51RwH4V86su/owCbBHNT
+TeiG3FxgeU7bIRiQcHHy8E4=
+=ZQF3
-----END PGP SIGNATURE-----
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