dep/style fixes

Package-Manager: portage-2.0.51.22-r1

5 files changed, 27 insertions, 27 deletions

diff --git a/dev-java/aterm-java/aterm-java-1.6.ebuild b/dev-java/aterm-java/aterm-java-1.6.ebuild
index c3399c0d8a4e..e38e018b7666 100644
--- a/dev-java/aterm-java/aterm-java-1.6.ebuild
+++ b/dev-java/aterm-java/aterm-java-1.6.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/aterm-java/aterm-java-1.6.ebuild,v 1.9 2005/04/22 08:15:00 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/aterm-java/aterm-java-1.6.ebuild,v 1.10 2005/07/16 14:54:12 axxo Exp $
 
 inherit java-pkg
 
@@ -11,10 +11,11 @@ LICENSE="LGPL-2.1"
 SLOT="1"
 KEYWORDS="x86 ~ppc amd64"
 IUSE=""
-DEPEND=">=virtual/jdk-1.4
-	dev-java/jjtraveler"
 RDEPEND=">=virtual/jre-1.4
-	>=dev-java/shared-objects-1.4"
+	>=dev-java/shared-objects-1.4
+	dev-java/jjtraveler"
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}"
 
 src_compile() {
 	econf || die "Failed to configure"
@@ -23,15 +24,15 @@ src_compile() {
 		echo "#! /bin/sh"
 		echo "java-config -p aterm-java-1"
 	) > aterm-java-config
-	tar zxvf aterm-javadoc.tar.gz && mv aterm-javadoc api
+	tar zxvf aterm-javadoc.tar.gz 
+	mv aterm-javadoc api
 }
 
 src_install() {
 	java-pkg_dojar aterm-1.6.jar
 
-	exeinto /usr/bin
-	doexe aterm-java-config
+	dobin aterm-java-config
 
 	java-pkg_dohtml -r api
-	dodoc AUTHORS COPYING INSTALL ChangeLog
+	dodoc AUTHORS ChangeLog
 }
diff --git a/dev-java/blowfishj/blowfishj-2.14.ebuild b/dev-java/blowfishj/blowfishj-2.14.ebuild
index 550905b7f19e..61593320fd61 100644
--- a/dev-java/blowfishj/blowfishj-2.14.ebuild
+++ b/dev-java/blowfishj/blowfishj-2.14.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/blowfishj/blowfishj-2.14.ebuild,v 1.2 2005/05/16 00:30:50 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blowfishj/blowfishj-2.14.ebuild,v 1.3 2005/07/16 14:50:28 axxo Exp $
 
 inherit java-pkg
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="x86 amd64 ppc ~sparc"
 IUSE="doc junit"
 
-DEPEND=">=virtual/jre-1.4
+DEPEND=">=virtual/jdk-1.4
 	app-arch/unzip
 	junit? ( dev-java/junit ) "
 RDEPEND=">=virtual/jre-1.4"
@@ -26,8 +26,7 @@ src_compile() {
 }
 
 src_install() {
-	mv target/${P}.jar ${PN}.jar
-	java-pkg_dojar ${PN}.jar
+	java-pkg_newjar target/${P}.jar ${PN}.jar
 
 	use doc && java-pkg_dohtml -r dist/docs/api/*
 }
diff --git a/dev-java/c3p0/c3p0-0.8.5.2.ebuild b/dev-java/c3p0/c3p0-0.8.5.2.ebuild
index caa41337ef51..6828e968d491 100644
--- a/dev-java/c3p0/c3p0-0.8.5.2.ebuild
+++ b/dev-java/c3p0/c3p0-0.8.5.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/c3p0/c3p0-0.8.5.2.ebuild,v 1.1 2005/06/29 17:18:21 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/c3p0/c3p0-0.8.5.2.ebuild,v 1.2 2005/07/16 14:46:15 axxo Exp $
 
 inherit java-pkg
 
@@ -10,7 +10,7 @@ DESCRIPTION="c3p0 is a java component to provide an jdbc database pool"
 HOMEPAGE="http://c3p0.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.src.tgz"
 DEPEND=">=virtual/jdk-1.3
-	>=dev-java/ant-1.4
+	dev-java/ant-core
 	jikes? ( dev-java/jikes )"
 RDEPEND=">=virtual/jre-1.3"
 LICENSE="LGPL-2"
@@ -23,7 +23,7 @@ S=${WORKDIR}/${PN}-${MY_PV}.src
 src_unpack() {
 	unpack ${A}
 	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,8 +33,8 @@ src_compile() {
 	ant ${antflags} || die "compilation failed"
 }
 
-src_install () {
-	java-pkg_newjar build/${PN}*.jar ${PN}.jar || die "installation failed"
+src_install() {
+	java-pkg_newjar build/${PN}*.jar ${PN}.jar
 	dodoc README-SRC
 	use doc && java-pkg_dohtml -r build/apidocs/*
 }
diff --git a/dev-java/c3p0/c3p0-0.8.5_pre9-r1.ebuild b/dev-java/c3p0/c3p0-0.8.5_pre9-r1.ebuild
index cb700c0c7e43..b496ee410334 100644
--- a/dev-java/c3p0/c3p0-0.8.5_pre9-r1.ebuild
+++ b/dev-java/c3p0/c3p0-0.8.5_pre9-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/c3p0/c3p0-0.8.5_pre9-r1.ebuild,v 1.1 2005/06/29 17:18:21 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/c3p0/c3p0-0.8.5_pre9-r1.ebuild,v 1.2 2005/07/16 14:46:15 axxo Exp $
 
 inherit java-pkg
 
@@ -10,7 +10,7 @@ DESCRIPTION="c3p0 is a java component to provide an jdbc database pool"
 HOMEPAGE="http://c3p0.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.src.tgz"
 DEPEND=">=virtual/jdk-1.3
-	>=dev-java/ant-1.4
+	dev-java/ant-core
 	jikes? ( dev-java/jikes )"
 RDEPEND=">=virtual/jre-1.3"
 LICENSE="LGPL-2"
@@ -23,7 +23,7 @@ S=${WORKDIR}/${PN}-${MY_PV}.src
 src_unpack() {
 	unpack ${A}
 	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,8 +33,8 @@ src_compile() {
 	ant ${antflags} || die "compilation failed"
 }
 
-src_install () {
-	java-pkg_newjar build/${PN}*.jar ${PN}.jar || die "installation failed"
+src_install() {
+	java-pkg_newjar build/${PN}*.jar ${PN}.jar
 	dodoc README-SRC
 	use doc && java-pkg_dohtml -r build/apidocs/*
 }
diff --git a/dev-java/c3p0/c3p0-0.9.0_pre6.ebuild b/dev-java/c3p0/c3p0-0.9.0_pre6.ebuild
index ce2469660f53..41510da34c2b 100644
--- a/dev-java/c3p0/c3p0-0.9.0_pre6.ebuild
+++ b/dev-java/c3p0/c3p0-0.9.0_pre6.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/c3p0/c3p0-0.9.0_pre6.ebuild,v 1.1 2005/06/29 17:18:21 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/c3p0/c3p0-0.9.0_pre6.ebuild,v 1.2 2005/07/16 14:46:15 axxo Exp $
 
 inherit java-pkg
 
@@ -10,7 +10,7 @@ DESCRIPTION="c3p0 is a java component to provide an jdbc database pool"
 HOMEPAGE="http://c3p0.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.src.tgz"
 DEPEND=">=virtual/jdk-1.3
-	>=dev-java/ant-1.4
+	dev-java/ant-core
 	jikes? ( dev-java/jikes )"
 RDEPEND=">=virtual/jre-1.3"
 LICENSE="LGPL-2"
@@ -23,7 +23,7 @@ S=${WORKDIR}/${PN}-${MY_PV}.src
 src_unpack() {
 	unpack ${A}
 	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,8 +33,8 @@ src_compile() {
 	ant ${antflags} || die "compilation failed"
 }
 
-src_install () {
-	java-pkg_newjar build/${PN}*.jar ${PN}.jar || die "installation failed"
+src_install() {
+	java-pkg_newjar build/${PN}*.jar ${PN}.jar
 	dodoc README-SRC
 	use doc && java-pkg_dohtml -r build/apidocs/*
 }