dep/style fixes

(Portage version: 2.0.51.22-r1)

2 files changed, 13 insertions, 13 deletions

diff --git a/dev-java/cglib/cglib-2.0.2-r1.ebuild b/dev-java/cglib/cglib-2.0.2-r1.ebuild
index 60e6e890ad3e..8c2a285f07da 100644
--- a/dev-java/cglib/cglib-2.0.2-r1.ebuild
+++ b/dev-java/cglib/cglib-2.0.2-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/cglib/cglib-2.0.2-r1.ebuild,v 1.2 2005/04/30 20:24:44 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/cglib-2.0.2-r1.ebuild,v 1.3 2005/07/15 17:52:17 axxo Exp $
 
 inherit eutils java-pkg
 
@@ -16,6 +16,7 @@ RDEPEND=">=virtual/jre-1.4
 	=dev-java/asm-1.4*
 	=dev-java/aspectwerkz-2*"
 DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}
 	>=dev-java/ant-core-1.5"
 IUSE="doc jikes source"
 
@@ -40,9 +41,8 @@ src_compile() {
 }
 
 src_install() {
-	mv dist/${PN}-${PV}.jar dist/${PN}.jar
-	mv dist/${PN}-full-${PV}.jar dist/${PN}-full.jar
-	java-pkg_dojar dist/${PN}.jar dist/${PN}-full.jar
+	java-pkg_newjar dist/${PN}-${PV}.jar ${PN}.jar
+	java-pkg_newjar dist/${PN}-full-${PV}.jar ${PN}-full.jar
 
 	dodoc NOTICE README
 	use doc && java-pkg_dohtml -r docs/*
diff --git a/dev-java/cglib/cglib-2.0.2.ebuild b/dev-java/cglib/cglib-2.0.2.ebuild
index 8287e3af592b..1e2255dbf97f 100644
--- a/dev-java/cglib/cglib-2.0.2.ebuild
+++ b/dev-java/cglib/cglib-2.0.2.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/cglib-2.0.2.ebuild,v 1.6 2005/04/22 08:59:56 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/cglib-2.0.2.ebuild,v 1.7 2005/07/15 17:52:17 axxo Exp $
 
 inherit java-pkg
 
 DESCRIPTION="cglib is a Dynamic Java byte code generator"
 HOMEPAGE="http://cglib.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.jar"
+RDEPEND=">=virtual/jre-1.3
+	dev-java/asm"
 DEPEND=">=virtual/jdk-1.3
-	dev-java/asm
+	${RDEPEND}
 	>=dev-java/ant-1.4"
-RDEPEND=">=virtual/jre-1.3"
 LICENSE="LGPL-2"
 SLOT="2"
 KEYWORDS="x86 ~ppc amd64"
@@ -20,9 +21,9 @@ S=${WORKDIR}
 
 src_unpack() {
 	cd ${S}
-	jar xf ${DISTDIR}/${A}
+	jar xf ${DISTDIR}/${A} || die "unpack failed"
 	cd ${S}
-	echo "j2ee.jar.base.dir=`java-config --jdk-home`" > build.properties
+	echo "j2ee.jar.base.dir=${JAVA_HOME}" > build.properties
 }
 
 src_compile() {
@@ -33,9 +34,8 @@ src_compile() {
 	ant ${antflags} || die "compilation failed"
 }
 
-src_install () {
-	mv dist/${PN}-full-${PV}.jar dist/${PN}-full.jar
-	java-pkg_dojar dist/${PN}-full.jar || die "installation failed"
-	dodoc README NOTICE LICENSE
+src_install() {
+	java-pkg_newjar dist/${PN}-full-${PV}.jar ${PN}-full.jar
+	dodoc README NOTICE
 	use doc && java-pkg_dohtml -r build/apidocs/*
 }