summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Matthijs <axxo@gentoo.org>2005-07-12 11:53:53 +0000
committerThomas Matthijs <axxo@gentoo.org>2005-07-12 11:53:53 +0000
commit0dfd85fa5ad4b666ab04c5b8ed5c01b4a2ede964 (patch)
tree00b36ecc352b738ae6442137eacb3f41aed207e6 /dev-java
parentdep/style fixes (diff)
downloadhistorical-0dfd85fa5ad4b666ab04c5b8ed5c01b4a2ede964.tar.gz
historical-0dfd85fa5ad4b666ab04c5b8ed5c01b4a2ede964.tar.bz2
historical-0dfd85fa5ad4b666ab04c5b8ed5c01b4a2ede964.zip
dep/style fixes
Package-Manager: portage-2.0.51.22-r1
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/commons-discovery/Manifest10
-rw-r--r--dev-java/commons-discovery/commons-discovery-0.2-r2.ebuild21
2 files changed, 17 insertions, 14 deletions
diff --git a/dev-java/commons-discovery/Manifest b/dev-java/commons-discovery/Manifest
index e47aae520a24..b84a0e34ab70 100644
--- a/dev-java/commons-discovery/Manifest
+++ b/dev-java/commons-discovery/Manifest
@@ -1,15 +1,15 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-MD5 9b7c72d74c208485d7fa7cedb743971b commons-discovery-0.2-r2.ebuild 1616
+MD5 71246cf0fc5c07bc4a1b6d568cd9eeeb commons-discovery-0.2-r2.ebuild 1507
MD5 c25000b1ba7960bb7f0d32fb95d366b8 ChangeLog 2012
MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
MD5 c986a5b1efe7715c57da38bb9423ef86 files/digest-commons-discovery-0.2-r2 76
MD5 18c8ff24139983c581fa7dbb1d6983fa files/commons-discovery-0.2-gentoo.diff 2296
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
-iD8DBQFCYnWf06ebR+OMO78RAtq5AJ9JuY+eD9hbY9vyy2OulrA6uy/3SACcDQEL
-vBRtlQOCtdzCth5eP0TvEgM=
-=EkDU
+iD8DBQFC069m/rLF9B432nYRAmxPAJ4go0qbiliqSdf46IB7KIHvGHkfEwCfYY7Y
+vo+etkbKX1hW4b88QnQ58n4=
+=ujL6
-----END PGP SIGNATURE-----
diff --git a/dev-java/commons-discovery/commons-discovery-0.2-r2.ebuild b/dev-java/commons-discovery/commons-discovery-0.2-r2.ebuild
index fc2320106ae9..30b8ebf89155 100644
--- a/dev-java/commons-discovery/commons-discovery-0.2-r2.ebuild
+++ b/dev-java/commons-discovery/commons-discovery-0.2-r2.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-java/commons-discovery/commons-discovery-0.2-r2.ebuild,v 1.2 2005/04/17 14:41:16 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-discovery/commons-discovery-0.2-r2.ebuild,v 1.3 2005/07/12 11:53:53 axxo Exp $
inherit java-pkg eutils
DESCRIPTION="Commons Discovery: Service Discovery component"
@@ -12,12 +12,15 @@ SLOT="0"
KEYWORDS="x86 ppc ~sparc amd64"
IUSE="source junit jikes doc"
-DEPEND="source? ( app-arch/zip )
+RDEPEND=">=virtual/jre-1.4
+ dev-java/commons-logging"
+
+DEPEND=">=virtual/jdk-1.4
+ ${RDEPEND}
+ dev-java/ant
+ source? ( app-arch/zip )
jikes? ( >=dev-java/jikes-1.21 )
- junit? ( >=dev-java/junit-3.8 >=virtual/jdk-1.4 dev-java/ant )
- dev-java/commons-logging
- !junit? ( >=virtual/jdk-1.3 dev-java/ant-core )"
-RDEPEND=">=virtual/jdk-1.3"
+ junit? ( >=dev-java/junit-3.8 )"
S="${WORKDIR}/${P}-src/discovery"
@@ -26,11 +29,11 @@ src_unpack() {
cd ${S}
chmod u+w ${S}/../discovery
- epatch ${FILESDIR}/${PN}-${PV}-gentoo.diff
+ epatch ${FILESDIR}/${P}-gentoo.diff
mkdir -p ${S}/target/lib && cd ${S}/target/lib
- java-pkg_jar-from junit junit.jar || die "Could not link to junit"
- java-pkg_jar-from commons-logging || die "Could not link to commons-logging"
+ use junit && java-pkg_jar-from junit junit.jar
+ java-pkg_jar-from commons-logging
}
src_compile() {