dep/style fixes

(Portage version: 2.0.51.22-r1)

2 files changed, 22 insertions, 21 deletions

diff --git a/dev-java/qat/qat-2.7.1-r1.ebuild b/dev-java/qat/qat-2.7.1-r1.ebuild
index 58fdd70bf284..74879c406646 100644
--- a/dev-java/qat/qat-2.7.1-r1.ebuild
+++ b/dev-java/qat/qat-2.7.1-r1.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/qat/qat-2.7.1-r1.ebuild,v 1.5 2005/05/16 22:26:23 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/qat/qat-2.7.1-r1.ebuild,v 1.6 2005/07/15 17:26:30 axxo Exp $
 
 inherit java-pkg
 
@@ -13,13 +13,15 @@ SLOT="0"
 KEYWORDS="x86 ~sparc ppc amd64"
 IUSE="doc examples jikes"
 
-DEPEND=">=virtual/jdk-1.3
-	app-arch/unzip
-	jikes? ( dev-java/jikes )"
 RDEPEND=">=virtual/jre-1.3
 	dev-java/jlfgr
 	dev-java/junit"
 
+DEPEND=">=virtual/jdk-1.3
+	${RDEPEND}
+	app-arch/unzip
+	jikes? ( dev-java/jikes )"
+
 S=${WORKDIR}
 
 src_unpack() {
@@ -37,8 +39,7 @@ src_compile() {
 }
 
 src_install() {
-	mv build/jar/${PN}-${PV}.jar build/jar/${PN}.jar
-	java-pkg_dojar build/jar/${PN}.jar
+	java-pkg_newjar build/jar/${P}.jar ${PN}.jar
 
 	echo "#!/bin/sh" > ${PN}
 	echo "java -classpath \$(java-config -p qat,junit,jlfgr) QAT" >> ${PN}
diff --git a/dev-java/radeox/radeox-1.0_beta2.ebuild b/dev-java/radeox/radeox-1.0_beta2.ebuild
index e45244fa82f5..099d9f049e70 100644
--- a/dev-java/radeox/radeox-1.0_beta2.ebuild
+++ b/dev-java/radeox/radeox-1.0_beta2.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/radeox/radeox-1.0_beta2.ebuild,v 1.9 2005/05/04 16:53:52 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/radeox/radeox-1.0_beta2.ebuild,v 1.10 2005/07/15 17:21:40 axxo Exp $
 
 inherit java-pkg
 
@@ -11,32 +11,32 @@ LICENSE="LGPL-2.1"
 SLOT="1"
 KEYWORDS="x86 ppc amd64"
 IUSE="doc jikes"
-DEPEND=">=virtual/jdk-1.4
-	dev-java/ant
-	jikes? ( dev-java/jikes )"
 RDEPEND=">=virtual/jre-1.4
 	=dev-java/jakarta-oro-2.0*
 	=dev-java/junit-3.8*
 	=dev-java/picocontainer-1.0*
 	=dev-java/commons-logging-1.0*"
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}
+	dev-java/ant
+	jikes? ( dev-java/jikes )"
 # karltk: is junit really necessary?
 S=${WORKDIR}/${PN}-1.0-BETA-2
 
 src_unpack() {
 	unpack ${A}
+	cd ${S}
 
-	rm -f ${S}/lib/*.jar
-	(
-		cd ${S}/lib
-		java-pkg_jar-from junit
-		java-pkg_jar-from jakarta-oro-2.0 jakarta-oro.jar oro.jar
-		java-pkg_jar-from commons-logging
-		java-pkg_jar-from picocontainer-1
+	rm -f lib/*.jar
+	cd lib
+	java-pkg_jar-from junit
+	java-pkg_jar-from jakarta-oro-2.0 jakarta-oro.jar oro.jar
+	java-pkg_jar-from commons-logging
+	java-pkg_jar-from picocontainer-1
+	cd ${S}
 
-	)
-	rm -rf  ${S}/src/org/radeox/example/ \
-		${S}/src/test/ \
-		${S}/src/org/radeox/test/
+	rm -rf  src/org/radeox/example/ \
+		src/test/ src/org/radeox/test/
 }
 
 src_compile() {