dep/style fixes

Package-Manager: portage-2.0.51.22-r1

2 files changed, 21 insertions, 19 deletions

diff --git a/dev-java/ehcache/ehcache-1.1.ebuild b/dev-java/ehcache/ehcache-1.1.ebuild
index dc9fbcc4ecf2..8a8b3751b487 100644
--- a/dev-java/ehcache/ehcache-1.1.ebuild
+++ b/dev-java/ehcache/ehcache-1.1.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/ehcache/ehcache-1.1.ebuild,v 1.2 2005/05/28 23:43:21 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ehcache/ehcache-1.1.ebuild,v 1.3 2005/07/16 13:44:52 axxo Exp $
 
 inherit java-pkg
 
@@ -13,19 +13,20 @@ SLOT="0"
 KEYWORDS="~x86 ~amd64"
 IUSE="doc junit jikes"
 
-DEPEND=">=virtual/jdk-1.4
-		>=dev-java/ant-core-1.5
-		jikes? ( dev-java/jikes )
-		junit? ( dev-java/junit	)"
 RDEPEND=">=virtual/jre-1.4
 		dev-java/commons-collections
 		dev-java/concurrent-util
 		dev-java/commons-logging"
+DEPEND=">=virtual/jdk-1.4
+		${RDEPEND}
+		>=dev-java/ant-core-1.5
+		jikes? ( dev-java/jikes )
+		junit? ( dev-java/junit	)"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	unzip ${P}-src.zip
+	unzip ${P}-src.zip || die
 	rm *.jar
 	rm -rf src/net/sf/ehcache/hibernate
 }
@@ -35,9 +36,9 @@ src_compile() {
 	cd ${S}/src
 
 	find . -name "*.java"| xargs javac -d ${S}/classes \
-		-classpath `java-config -p commons-logging,commons-collections`
+		-classpath $(java-pkg_getjars commons-logging,commons-collections)
 	cd ${S}/classes
-	jar cf ${S}/${P}.jar *
+	jar cf ${S}/${P}.jar * || die
 }
 
 src_install() {
@@ -45,7 +46,7 @@ src_install() {
 	java-pkg_newjar ${S}/${P}.jar ${PN}.jar
 	dodoc *.txt ehcache.xml ehcache.xsd
 	if use doc ; then
-		unzip ${P}-javadoc.zip
+		unzip ${P}-javadoc.zip || die
 		java-pkg_dohtml -r docs
 	fi
 }
diff --git a/dev-java/fesi/fesi-1.1.8.ebuild b/dev-java/fesi/fesi-1.1.8.ebuild
index 52cf76245331..b87573849d44 100644
--- a/dev-java/fesi/fesi-1.1.8.ebuild
+++ b/dev-java/fesi/fesi-1.1.8.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/fesi/fesi-1.1.8.ebuild,v 1.5 2005/05/01 10:00:30 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fesi/fesi-1.1.8.ebuild,v 1.6 2005/07/16 13:42:24 axxo Exp $
 
 inherit eutils java-pkg
 
@@ -11,15 +11,16 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86 ppc"
 IUSE="doc examples jikes source"
-DEPEND=">=virtual/jdk-1.3
-	dev-java/ant-core
-	jikes? ( >=dev-java/jikes-1.21 )
-	source? ( app-arch/zip )"
-RDEPEND=">=virtual/jdk-1.3
+RDEPEND=">=virtual/jre-1.3
 	=dev-java/bsf-2.3*
 	=dev-java/jakarta-oro-2.0*
 	>=dev-java/javacc-3.2
 	=dev-java/gnu-regexp-1.1*"
+DEPEND=">=virtual/jdk-1.3
+	${RDEPEND}
+	dev-java/ant-core
+	jikes? ( >=dev-java/jikes-1.21 )
+	source? ( app-arch/zip )"
 
 src_unpack() {
 	unpack ${A}
@@ -29,10 +30,10 @@ src_unpack() {
 
 	bf=build.properties
 	cd ant/
-	echo "javaccdir=`java-config -p javacc`" > ${bf}
-	echo "ororegexp=`java-config -p jakarta-oro-2.0`" >> ${bf}
-	echo "gnuregexp=`java-config -p gnu-regexp-1`" >> ${bf}
-	echo "bsfdir=`java-config -p bsf-2.3`" >> ${bf}
+	echo "javaccdir=$(java-pkg_getjars javacc)" > ${bf}
+	echo "ororegexp=$(java-pkg_getjars jakarta-oro-2.0)" >> ${bf}
+	echo "gnuregexp=$(java-pkg_getjars gnu-regexp-1)" >> ${bf}
+	echo "bsfdir=$(java-pkg_getjars bsf-2.3)" >> ${bf}
 }
 
 src_compile() {