dep/style fix

(Portage version: 2.0.51.22-r1)

9 files changed, 13 insertions, 247 deletions

diff --git a/dev-java/quartz/files/digest-quartz-1.4.0 b/dev-java/quartz/files/digest-quartz-1.4.0
deleted file mode 100644
index e623271663f5..000000000000
--- a/dev-java/quartz/files/digest-quartz-1.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f549780d1f8c2cc00e8268c2b9dee07b quartz-1.4.0.tar.gz 2232428
diff --git a/dev-java/quartz/files/digest-quartz-1.4.2 b/dev-java/quartz/files/digest-quartz-1.4.2
deleted file mode 100644
index ff7c20340f2e..000000000000
--- a/dev-java/quartz/files/digest-quartz-1.4.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1a8cb211952125baf413bb08c912f86e quartz-1.4.2.tar.gz 2250231
diff --git a/dev-java/quartz/files/digest-quartz-1.4.3 b/dev-java/quartz/files/digest-quartz-1.4.3
deleted file mode 100644
index 13381484b409..000000000000
--- a/dev-java/quartz/files/digest-quartz-1.4.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bb958b14344decb6ebc352aac4f420c5 quartz-1.4.3.tar.gz 2352293
diff --git a/dev-java/quartz/files/digest-quartz-1.4.4 b/dev-java/quartz/files/digest-quartz-1.4.4
deleted file mode 100644
index 9efb8fcffd3f..000000000000
--- a/dev-java/quartz/files/digest-quartz-1.4.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d121320ee11f3ea7ca0eb6b478d0987c quartz-1.4.4.zip 3022977
diff --git a/dev-java/quartz/quartz-1.4.0.ebuild b/dev-java/quartz/quartz-1.4.0.ebuild
deleted file mode 100644
index 78dcefb04f71..000000000000
--- a/dev-java/quartz/quartz-1.4.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/quartz/quartz-1.4.0.ebuild,v 1.8 2005/05/05 23:04:59 swegener Exp $
-
-inherit java-pkg
-
-DESCRIPTION="Quartz Scheduler from OpenSymphony"
-HOMEPAGE="http://www.opensymphony.com/quartz/"
-SRC_URI="mirror://sourceforge/quartz/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="dbcp doc jboss jikes jmx jta oracle servlet-2.3 servlet-2.4 struts"
-
-DEPEND=">=virtual/jdk-1.4
-		oracle? ( >=dev-java/jdbc3-oracle-9.2.0.3 )
-		servlet-2.3? ( >=dev-java/servletapi-2.3 )
-		servlet-2.4? ( >=dev-java/servletapi-2.4 )
-		dbcp? ( >=dev-java/commons-dbcp-1.1 )
-		jboss? ( >=www-servers/jboss-3.2.3 )
-		jta? ( >=dev-java/jta-1.0.1 )
-		jmx? ( >=dev-java/jmx-1.2.1 )
-		struts? ( >=dev-java/struts-1.1 )
-		jikes? ( dev-java/jikes )"
-
-src_compile() {
-	local antflags=""
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-
-	use servlet-2.3 && CLASSPATH="$CLASSPATH:`java-config -p servletapi-2.3`"
-	use servlet-2.4 && CLASSPATH="$CLASSPATH:`java-config -p servletapi-2.4`"
-	use dbcp && CLASSPATH="$CLASSPATH:`java-config -p commons-dbcp`"
-	use jta && CLASSPATH="$CLASSPATH:`java-config -p jta`"
-	use oracle && CLASSPATH="$CLASSPATH:`java-config -p jdbc2-oracle-5`"
-	if use jboss; then
-		cp /usr/share/jboss/lib/jboss-common.jar ${S}/lib
-		cp /usr/share/jboss/lib/jboss-jmx.jar ${S}/lib
-		cp /usr/share/jboss/lib/jboss-system.jar ${S}/lib
-		cp /var/lib/jboss/default/lib/jboss.jar ${S}/lib
-		antflags="${antflags} -Dlib.jboss-common.jar=/usr/share/jboss/lib/jboss-common.jar"
-		antflags="${antflags} -Dlib.jboss-jmx.jar=/usr/share/jboss/lib/jboss-jmx.jar"
-		antflags="${antflags} -Dlib.jboss-system.jar=/usr/share/jboss/lib/jboss-system.jar"
-		antflags="${antflags} -Dlib.jboss.jar=/var/lib/jboss/default/lib/jboss.jar"
-	fi
-	use struts && CLASSPATH="$CLASSPATH:`java-config -p struts`"
-
-	antflags="${antflags} compile jar"
-	use doc && antflags="${antflags} javadoc"
-
-	ant ${antflags} || die "compile failed"
-}
-
-
-src_install() {
-	java-pkg_dojar lib/quartz.jar
-	use doc && java-pkg_dohtml -r docs/
-}
diff --git a/dev-java/quartz/quartz-1.4.2.ebuild b/dev-java/quartz/quartz-1.4.2.ebuild
deleted file mode 100644
index 16ea448ed107..000000000000
--- a/dev-java/quartz/quartz-1.4.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/quartz/quartz-1.4.2.ebuild,v 1.3 2005/05/05 23:04:59 swegener Exp $
-
-inherit java-pkg
-
-DESCRIPTION="Quartz Scheduler from OpenSymphony"
-HOMEPAGE="http://www.opensymphony.com/quartz/"
-SRC_URI="mirror://sourceforge/quartz/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="dbcp doc jboss jikes jmx jta oracle servlet-2.3 servlet-2.4 struts"
-
-DEPEND=">=virtual/jdk-1.4
-		oracle? ( >=dev-java/jdbc3-oracle-9.2.0.3 )
-		servlet-2.3? ( >=dev-java/servletapi-2.3 )
-		servlet-2.4? ( >=dev-java/servletapi-2.4 )
-		dbcp? ( >=dev-java/commons-dbcp-1.1 )
-		jboss? ( >=www-servers/jboss-3.2.3 )
-		jta? ( >=dev-java/jta-1.0.1 )
-		jmx? ( >=dev-java/jmx-1.2.1 )
-		struts? ( >=dev-java/struts-1.1 )
-		jikes? ( dev-java/jikes )"
-
-src_compile() {
-	local antflags=""
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-
-	use servlet-2.3 && CLASSPATH="$CLASSPATH:`java-config -p servletapi-2.3`"
-	use servlet-2.4 && CLASSPATH="$CLASSPATH:`java-config -p servletapi-2.4`"
-	use dbcp && CLASSPATH="$CLASSPATH:`java-config -p commons-dbcp`"
-	use jta && CLASSPATH="$CLASSPATH:`java-config -p jta`"
-	use oracle && CLASSPATH="$CLASSPATH:`java-config -p jdbc2-oracle-5`"
-	if use jboss; then
-		cp /usr/share/jboss/lib/jboss-common.jar ${S}/lib
-		cp /usr/share/jboss/lib/jboss-jmx.jar ${S}/lib
-		cp /usr/share/jboss/lib/jboss-system.jar ${S}/lib
-		cp /var/lib/jboss/default/lib/jboss.jar ${S}/lib
-		antflags="${antflags} -Dlib.jboss-common.jar=/usr/share/jboss/lib/jboss-common.jar"
-		antflags="${antflags} -Dlib.jboss-jmx.jar=/usr/share/jboss/lib/jboss-jmx.jar"
-		antflags="${antflags} -Dlib.jboss-system.jar=/usr/share/jboss/lib/jboss-system.jar"
-		antflags="${antflags} -Dlib.jboss.jar=/var/lib/jboss/default/lib/jboss.jar"
-	fi
-	use struts && CLASSPATH="$CLASSPATH:`java-config -p struts`"
-
-	antflags="${antflags} compile jar"
-	use doc && antflags="${antflags} javadoc"
-
-	ant ${antflags} || die "compile failed"
-}
-
-
-src_install() {
-	java-pkg_dojar lib/quartz.jar
-	use doc && java-pkg_dohtml -r docs/
-}
diff --git a/dev-java/quartz/quartz-1.4.3.ebuild b/dev-java/quartz/quartz-1.4.3.ebuild
deleted file mode 100644
index 90907f1735ec..000000000000
--- a/dev-java/quartz/quartz-1.4.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/quartz/quartz-1.4.3.ebuild,v 1.3 2005/05/05 23:04:59 swegener Exp $
-
-inherit java-pkg
-
-DESCRIPTION="Quartz Scheduler from OpenSymphony"
-HOMEPAGE="http://www.opensymphony.com/quartz/"
-SRC_URI="mirror://sourceforge/quartz/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="dbcp doc jboss jikes jmx jta oracle servlet-2.3 servlet-2.4 struts"
-
-DEPEND=">=virtual/jdk-1.4
-		oracle? ( >=dev-java/jdbc3-oracle-9.2.0.3 )
-		servlet-2.3? ( >=dev-java/servletapi-2.3 )
-		servlet-2.4? ( >=dev-java/servletapi-2.4 )
-		dbcp? ( >=dev-java/commons-dbcp-1.1 )
-		jboss? ( >=www-servers/jboss-3.2.3 )
-		jta? ( >=dev-java/jta-1.0.1 )
-		jmx? ( >=dev-java/jmx-1.2.1 )
-		struts? ( >=dev-java/struts-1.1 )
-		jikes? ( dev-java/jikes )"
-
-src_compile() {
-	local antflags=""
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-
-	use servlet-2.3 && CLASSPATH="$CLASSPATH:`java-config -p servletapi-2.3`"
-	use servlet-2.4 && CLASSPATH="$CLASSPATH:`java-config -p servletapi-2.4`"
-	use dbcp && CLASSPATH="$CLASSPATH:`java-config -p commons-dbcp`"
-	use jta && CLASSPATH="$CLASSPATH:`java-config -p jta`"
-	use oracle && CLASSPATH="$CLASSPATH:`java-config -p jdbc2-oracle-5`"
-	if use jboss; then
-		cp /usr/share/jboss/lib/jboss-common.jar ${S}/lib
-		cp /usr/share/jboss/lib/jboss-jmx.jar ${S}/lib
-		cp /usr/share/jboss/lib/jboss-system.jar ${S}/lib
-		cp /var/lib/jboss/default/lib/jboss.jar ${S}/lib
-		antflags="${antflags} -Dlib.jboss-common.jar=/usr/share/jboss/lib/jboss-common.jar"
-		antflags="${antflags} -Dlib.jboss-jmx.jar=/usr/share/jboss/lib/jboss-jmx.jar"
-		antflags="${antflags} -Dlib.jboss-system.jar=/usr/share/jboss/lib/jboss-system.jar"
-		antflags="${antflags} -Dlib.jboss.jar=/var/lib/jboss/default/lib/jboss.jar"
-	fi
-	use struts && CLASSPATH="$CLASSPATH:`java-config -p struts`"
-
-	antflags="${antflags} compile jar"
-	use doc && antflags="${antflags} javadoc"
-
-	ant ${antflags} || die "compile failed"
-}
-
-
-src_install() {
-	java-pkg_dojar lib/quartz.jar
-	use doc && java-pkg_dohtml -r docs/
-}
diff --git a/dev-java/quartz/quartz-1.4.4.ebuild b/dev-java/quartz/quartz-1.4.4.ebuild
deleted file mode 100644
index 9cbd3adc1d18..000000000000
--- a/dev-java/quartz/quartz-1.4.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/quartz/quartz-1.4.4.ebuild,v 1.3 2005/05/05 23:04:59 swegener Exp $
-
-inherit java-pkg
-
-DESCRIPTION="Quartz Scheduler from OpenSymphony"
-HOMEPAGE="http://www.opensymphony.com/quartz/"
-SRC_URI="mirror://sourceforge/quartz/${P}.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="dbcp doc jboss jikes jmx jta oracle servlet-2.3 servlet-2.4 struts"
-
-DEPEND=">=virtual/jdk-1.4
-		oracle? ( >=dev-java/jdbc3-oracle-9.2.0.3 )
-		servlet-2.3? ( >=dev-java/servletapi-2.3 )
-		servlet-2.4? ( >=dev-java/servletapi-2.4 )
-		dbcp? ( >=dev-java/commons-dbcp-1.1 )
-		jboss? ( >=www-servers/jboss-3.2.3 )
-		jta? ( >=dev-java/jta-1.0.1 )
-		jmx? ( >=dev-java/jmx-1.2.1 )
-		struts? ( >=dev-java/struts-1.1 )
-		jikes? ( dev-java/jikes )
-		app-arch/unzip"
-
-src_compile() {
-	local antflags=""
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-
-	use servlet-2.3 && CLASSPATH="$CLASSPATH:`java-config -p servletapi-2.3`"
-	use servlet-2.4 && CLASSPATH="$CLASSPATH:`java-config -p servletapi-2.4`"
-	use dbcp && CLASSPATH="$CLASSPATH:`java-config -p commons-dbcp`"
-	use jta && CLASSPATH="$CLASSPATH:`java-config -p jta`"
-	use oracle && CLASSPATH="$CLASSPATH:`java-config -p jdbc2-oracle-5`"
-	if use jboss; then
-		cp /usr/share/jboss/lib/jboss-common.jar ${S}/lib
-		cp /usr/share/jboss/lib/jboss-jmx.jar ${S}/lib
-		cp /usr/share/jboss/lib/jboss-system.jar ${S}/lib
-		cp /var/lib/jboss/default/lib/jboss.jar ${S}/lib
-		antflags="${antflags} -Dlib.jboss-common.jar=/usr/share/jboss/lib/jboss-common.jar"
-		antflags="${antflags} -Dlib.jboss-jmx.jar=/usr/share/jboss/lib/jboss-jmx.jar"
-		antflags="${antflags} -Dlib.jboss-system.jar=/usr/share/jboss/lib/jboss-system.jar"
-		antflags="${antflags} -Dlib.jboss.jar=/var/lib/jboss/default/lib/jboss.jar"
-	fi
-	use struts && CLASSPATH="$CLASSPATH:`java-config -p struts`"
-
-	antflags="${antflags} compile jar"
-	use doc && antflags="${antflags} javadoc"
-
-	ant ${antflags} || die "compile failed"
-}
-
-
-src_install() {
-	java-pkg_dojar lib/quartz.jar
-	use doc && java-pkg_dohtml -r docs/
-}
diff --git a/dev-java/quartz/quartz-1.4.5.ebuild b/dev-java/quartz/quartz-1.4.5.ebuild
index 6306cdc7aff5..a22c69296bbf 100644
--- a/dev-java/quartz/quartz-1.4.5.ebuild
+++ b/dev-java/quartz/quartz-1.4.5.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/quartz/quartz-1.4.5.ebuild,v 1.1 2005/05/21 16:56:49 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/quartz/quartz-1.4.5.ebuild,v 1.2 2005/07/18 16:57:26 axxo Exp $
 
 inherit java-pkg
 
@@ -12,8 +12,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
 IUSE="dbcp doc jboss jikes jmx jta oracle servlet-2.3 servlet-2.4 struts"
-
-DEPEND=">=virtual/jdk-1.4
+RDEPEND=">=virtual/jre-1.4
 		oracle? ( >=dev-java/jdbc3-oracle-9.2.0.3 )
 		servlet-2.3? ( >=dev-java/servletapi-2.3 )
 		servlet-2.4? ( >=dev-java/servletapi-2.4 )
@@ -22,18 +21,22 @@ DEPEND=">=virtual/jdk-1.4
 		jta? ( >=dev-java/jta-1.0.1 )
 		jmx? ( >=dev-java/jmx-1.2.1 )
 		struts? ( >=dev-java/struts-1.1 )
-		jikes? ( dev-java/jikes )
+		jikes? ( dev-java/jikes )"
+
+DEPEND=">=virtual/jdk-1.4
+		${RDEPEND}
+		dev-java/ant
 		app-arch/unzip"
 
 src_compile() {
 	local antflags=""
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 
-	use servlet-2.3 && CLASSPATH="$CLASSPATH:`java-config -p servletapi-2.3`"
-	use servlet-2.4 && CLASSPATH="$CLASSPATH:`java-config -p servletapi-2.4`"
-	use dbcp && CLASSPATH="$CLASSPATH:`java-config -p commons-dbcp`"
-	use jta && CLASSPATH="$CLASSPATH:`java-config -p jta`"
-	use oracle && CLASSPATH="$CLASSPATH:`java-config -p jdbc2-oracle-5`"
+	use servlet-2.3 && CLASSPATH="$CLASSPATH:$(java-pkg_getjars servletapi-2.3)"
+	use servlet-2.4 && CLASSPATH="$CLASSPATH:$(java-pkg_getjars servletapi-2.4)"
+	use dbcp && CLASSPATH="$CLASSPATH:$(java-pkg_getjars commons-dbcp)"
+	use jta && CLASSPATH="$CLASSPATH:$(java-pkg_getjars jta)"
+	use oracle && CLASSPATH="$CLASSPATH:$(java-pkg_getjars jdbc2-oracle-5)"
 	if use jboss; then
 		cp /usr/share/jboss/lib/jboss-common.jar ${S}/lib
 		cp /usr/share/jboss/lib/jboss-jmx.jar ${S}/lib
@@ -44,7 +47,7 @@ src_compile() {
 		antflags="${antflags} -Dlib.jboss-system.jar=/usr/share/jboss/lib/jboss-system.jar"
 		antflags="${antflags} -Dlib.jboss.jar=/var/lib/jboss/default/lib/jboss.jar"
 	fi
-	use struts && CLASSPATH="$CLASSPATH:`java-config -p struts`"
+	use struts && CLASSPATH="$CLASSPATH:$(java-pkg_getjars struts)"
 
 	antflags="${antflags} compile jar"
 	use doc && antflags="${antflags} javadoc"