dep/style fixes

Package-Manager: portage-2.0.51.22-r1

2 files changed, 23 insertions, 14 deletions

diff --git a/dev-java/oscache/Manifest b/dev-java/oscache/Manifest
index b67eb4372e24..90aba6788383 100644
--- a/dev-java/oscache/Manifest
+++ b/dev-java/oscache/Manifest
@@ -1,4 +1,14 @@
-MD5 4384114ff3a4b3ebeba94f38f711744e oscache-2.0.2.ebuild 2170
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 92b8991800e68984ef38b5f49f0c867b oscache-2.0.2.ebuild 2166
 MD5 8bfe5be3ffc74721ebe270f27dc824f3 ChangeLog 620
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 MD5 d52039b83271f4379d0aefff244164aa files/digest-oscache-2.0.2 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC2ANE/rLF9B432nYRAow2AJ4wjV4FDXeqC+PXedPjxwIfSaitggCgg9Je
+TsWp0gZZreuqxtr68vUai40=
+=QbD7
+-----END PGP SIGNATURE-----
diff --git a/dev-java/oscache/oscache-2.0.2.ebuild b/dev-java/oscache/oscache-2.0.2.ebuild
index 46a851b465f5..0e812b23d7ad 100644
--- a/dev-java/oscache/oscache-2.0.2.ebuild
+++ b/dev-java/oscache/oscache-2.0.2.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/oscache/oscache-2.0.2.ebuild,v 1.3 2005/01/20 19:40:35 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oscache/oscache-2.0.2.ebuild,v 1.4 2005/07/15 18:40:28 axxo Exp $
 
 inherit java-pkg
 
@@ -16,9 +16,9 @@ RDEPEND=">=virtual/jre-1.3
 		=dev-java/servletapi-2.3*
 		dev-java/jms
 		dev-java/jgroups"
-DEPEND="${RDEPEND}
+DEPEND=">=virtual/jdk-1.3
+		${RDEPEND}
 		app-arch/unzip
-		>=virtual/jdk-1.3
 		jikes? ( dev-java/jikes )"
 IUSE="doc jikes"
 
@@ -30,28 +30,28 @@ src_unpack() {
 }
 
 src_compile() {
-	javac_cmd="javac"
+	local javac_cmd="javac"
 	use jikes && javac_cmd="jikes -bootclasspath ${JAVA_HOME}/jre/lib/rt.jar"
 
-	build_dir=${S}/build
-	local classpath="-classpath $(java-config -p commons-logging,commons-collections,servletapi-2.3,jms,jgroups):${build_dir}:."
+	local build_dir=${S}/build
+	local classpath="-classpath $(java-pkg_getjars commons-logging,commons-collections,servletapi-2.3,jms,jgroups):${build_dir}:."
 	mkdir ${build_dir}
 
-	einfo "Building core..."
+	echo "Building core..."
 	cd ${S}/src/core/java
-	${javac_cmd} ${classpath} -nowarn -d ${build_dir} `find -name "*.java"`
+	${javac_cmd} ${classpath} -nowarn -d ${build_dir} $(find -name "*.java") || die
 
-	einfo "Building cluster support plugin..."
+	echo "Building cluster support plugin..."
 	cd ${S}/src/plugins/clustersupport/java
 	find -name "*.java" -exec sed -i -e "s/org.javagroups/org.jgroups/g" {} \;
-	${javac_cmd} ${classpath} -nowarn -d ${build_dir} `find -name "*.java"`
+	${javac_cmd} ${classpath} -nowarn -d ${build_dir} $(find -name "*.java") || die
 
-	einfo "Building disk persistence plugin..."
+	echo "Building disk persistence plugin..."
 	cd ${S}/src/plugins/diskpersistence/java
 	${javac_cmd} ${classpath} -nowarn -d ${build_dir} `find -name "*.java"` || die "compile failed"
 
 	if use doc ; then
-		einfo "Building documentation..."
+		echo "Building documentation..."
 		mkdir ${S}/javadoc
 		cd ${build_dir}
 		local sourcepath="${S}/src/core/java:${S}/src/plugins/diskpersistence/java:${S}/src/plugins/clustersupport/java"
@@ -60,7 +60,6 @@ src_compile() {
 			|| die "failed to create javadoc"
 	fi
 
-	einfo "Building JAR..."
 	cd ${S}
 	jar cf ${PN}.jar -C build .
 }