fix deps

(Portage version: 2.0.51.22-r1)

7 files changed, 36 insertions, 157 deletions

diff --git a/dev-java/ant-tasks/ChangeLog b/dev-java/ant-tasks/ChangeLog
index e9c9635f64b5..363e307520c4 100644
--- a/dev-java/ant-tasks/ChangeLog
+++ b/dev-java/ant-tasks/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ant-tasks
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ChangeLog,v 1.27 2005/06/02 16:25:12 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ChangeLog,v 1.28 2005/07/09 14:10:07 axxo Exp $
+
+  09 Jul 2005; Thomas Matthijs <axxo@gentoo.org> -ant-tasks-1.6.2-r8.ebuild,
+  ant-tasks-1.6.2-r9.ebuild, ant-tasks-1.6.5.ebuild:
+  fix deps
 
   02 Jun 2005; Thomas Matthijs <axxo@gentoo.org> -ant-tasks-1.6.3-r1.ebuild,
   -ant-tasks-1.6.4.ebuild:
diff --git a/dev-java/ant-tasks/Manifest b/dev-java/ant-tasks/Manifest
index ff33d04557a5..d26f45c4da7d 100644
--- a/dev-java/ant-tasks/Manifest
+++ b/dev-java/ant-tasks/Manifest
@@ -1,21 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 3276ea5d11ab71e08e7ff2dc25908676 ant-tasks-1.6.2-r8.ebuild 3766
-MD5 0aff4391a50a4c9ce323e73f2f2ffd52 ant-tasks-1.6.5.ebuild 3817
-MD5 6fba18154381ac2dd020712b0dea38bb ant-tasks-1.6.2-r10.ebuild 3843
-MD5 a2f8a9cfc175c45fb687004cd52900e3 ant-tasks-1.6.2-r9.ebuild 3766
-MD5 7fa625af66c6f2ee0d8cfecc307244f8 ChangeLog 9484
+MD5 0753889fb678a058d8d52c13d22d3bc8 ant-tasks-1.6.5.ebuild 3864
+MD5 60357d25425c7088dbef5d28054c9267 ant-tasks-1.6.2-r10.ebuild 3890
+MD5 22b9375803d00e972e8e108c284d15d4 ant-tasks-1.6.2-r9.ebuild 3811
+MD5 d32872403a6696c25642d84e23468d74 ChangeLog 9633
 MD5 4dad079a28768d183022cff420f01281 metadata.xml 220
 MD5 181609c8f2d789fc7abf5cd39a027130 files/digest-ant-tasks-1.6.5 74
 MD5 aac477e88787ed6f0ad5cabe0f6a001a files/digest-ant-tasks-1.6.2-r10 74
-MD5 aac477e88787ed6f0ad5cabe0f6a001a files/digest-ant-tasks-1.6.2-r8 74
 MD5 aac477e88787ed6f0ad5cabe0f6a001a files/digest-ant-tasks-1.6.2-r9 74
 MD5 8c69a473b88559829069ac80730f2f1b files/1.6.2-scp.patch 877
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCnzMB/rLF9B432nYRAseVAKCB4+K3WFIrXzN/uHaJZfERX6j8ugCeMVPx
-DopxZGFikK+PA+yRlj02PPI=
-=ZV3K
------END PGP SIGNATURE-----
diff --git a/dev-java/ant-tasks/ant-tasks-1.6.2-r10.ebuild b/dev-java/ant-tasks/ant-tasks-1.6.2-r10.ebuild
index 06fd0c13a003..85961228d155 100644
--- a/dev-java/ant-tasks/ant-tasks-1.6.2-r10.ebuild
+++ b/dev-java/ant-tasks/ant-tasks-1.6.2-r10.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/ant-tasks/ant-tasks-1.6.2-r10.ebuild,v 1.1 2005/05/14 16:10:22 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ant-tasks-1.6.2-r10.ebuild,v 1.2 2005/07/09 14:10:07 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -13,9 +13,9 @@ SLOT="0"
 KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~ppc64"
 IUSE="javamail noantlr nobcel nobeanutils nobsh nobsf nocommonsnet nocommonslogging nojdepend nojsch nojython nolog4j nooro noregexp norhino noxalan noxerces"
 
-DEPEND="=dev-java/ant-core-${PV}*
+RDEPEND=">=virtual/jre-1.4
+	=dev-java/ant-core-${PV}*
 	!dev-java/ant-optional
-	>=dev-java/java-config-1.2
 	>=dev-java/junit-3.8
 	!nolog4j? ( >=dev-java/log4j-1.2.8 )
 	!noxerces? ( >=dev-java/xerces-2.6.2-r1 )
@@ -27,14 +27,16 @@ DEPEND="=dev-java/ant-core-${PV}*
 	!nocommonslogging? ( >=dev-java/commons-logging-1.0.3 )
 	!nocommonsnet? ( >=dev-java/commons-net-1.1.0 )
 	!nobcel? ( >=dev-java/bcel-5.1 )
-	!nooro? ( =dev-java/jakarta-oro-2.0.8-r1 )
+	!nooro? ( >=dev-java/jakarta-oro-2.0.8-r1 )
 	!norhino? ( =dev-java/rhino-1.5* )
 	!nojdepend? ( >=dev-java/jdepend-2.6 )
 	!nojsch? ( >=dev-java/jsch-0.1.12 )
 	!noregexp? ( >=dev-java/jakarta-regexp-1.3-r2 )
 	!nojython? ( >=dev-java/jython-2.1-r5 )
 	javamail? ( >=dev-java/sun-javamail-bin-1.3 )"
-RDEPEND="${DEPEND}"
+DEPEND=">=virtual/jdk-1.4
+	>=dev-java/java-config-1.2
+	${RDEPEND}"
 
 S="${WORKDIR}/apache-ant-${PV}"
 
@@ -54,7 +56,7 @@ src_compile() {
 		export THREADS_FLAG="green"
 	fi
 
-	local p="ant-core,junit"
+	local p="ant-core,junit" libs
 	use noantlr || p="${p},antlr"
 	use nobcel || p="${p},bcel"
 	use nobeanutils || p="${p},commons-beanutils-1.6"
@@ -74,7 +76,7 @@ src_compile() {
 
 	use javamail && p="${p},sun-javamail-bin,sun-jaf-bin"
 
-	libs=$(java-config -p ${p})
+	libs=$(java-pkg_getjars ${p})
 	CLASSPATH="." ./build.sh -Ddist.dir=${D}/usr/share/ant-core -lib ${libs} || die "build failed"
 }
 
diff --git a/dev-java/ant-tasks/ant-tasks-1.6.2-r8.ebuild b/dev-java/ant-tasks/ant-tasks-1.6.2-r8.ebuild
deleted file mode 100644
index 43a043f48902..000000000000
--- a/dev-java/ant-tasks/ant-tasks-1.6.2-r8.ebuild
+++ /dev/null
@@ -1,118 +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/ant-tasks/ant-tasks-1.6.2-r8.ebuild,v 1.1 2005/05/14 16:10:22 luckyduck Exp $
-
-inherit java-pkg eutils
-
-DESCRIPTION="Apache ANT Optional Tasks Jar Files"
-HOMEPAGE="http://ant.apache.org/"
-SRC_URI="mirror://apache/ant/source/apache-ant-${PV}-src.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="x86 amd64 ppc sparc ppc64"
-IUSE="javamail noantlr nobcel nobeanutils nobsh nocommonsnet nocommonslogging nojdepend nojsch nojython nolog4j nooro noregexp norhino noxalan noxerces"
-
-DEPEND="=dev-java/ant-core-${PV}*
-	!dev-java/ant-optional
-	>=dev-java/java-config-1.2
-	>=dev-java/junit-3.8
-	!nolog4j? ( >=dev-java/log4j-1.2.8 )
-	!noxerces? ( >=dev-java/xerces-2.6.2-r1 )
-	!noxalan? ( >=dev-java/xalan-2.5.2 )
-	!nobsh? ( >=dev-java/bsh-1.2-r7 )
-	!noantlr? ( >=dev-java/antlr-2.7.2 )
-	!nobeanutils? ( =dev-java/commons-beanutils-1.6* )
-	!nocommonslogging? ( >=dev-java/commons-logging-1.0.3 )
-	!nocommonsnet? ( >=dev-java/commons-net-1.1.0 )
-	!nobcel? ( >=dev-java/bcel-5.1 )
-	!nooro? ( >=dev-java/jakarta-oro-2.0.8-r1 )
-	!norhino? ( =dev-java/rhino-1.5* )
-	!nojdepend? ( >=dev-java/jdepend-2.6 )
-	!nojsch? ( >=dev-java/jsch-0.1.12 )
-	!noregexp? ( >=dev-java/jakarta-regexp-1.3-r2 )
-	!nojython? ( >=dev-java/jython-2.1-r5 )
-	javamail? ( >=dev-java/sun-javamail-bin-1.3 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/apache-ant-${PV}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# also see #77365
-	epatch ${FILESDIR}/${PV}-scp.patch
-}
-
-src_compile() {
-	addwrite "/proc/self/maps"
-	export JAVA_HOME=${JDK_HOME}
-	if [ `arch` == "ppc" ] ; then
-		# We're compiling _ON_ PPC
-		export THREADS_FLAG="green"
-	fi
-
-	local p="ant-core,junit"
-	use noantlr || p="${p},antlr"
-	use nobcel || p="${p},bcel"
-	use nobeanutils || p="${p},commons-beanutils-1.6"
-	use nobsh || p="${p},bsh"
-	use nocommonslogging || p="${p},commons-logging"
-	use nocommonsnet || p="${p},commons-net"
-	use nojdepend || p="${p},jdepend"
-	use nojsch || p="${p},jsch"
-	use nojython || p="${p},jython"
-	use nolog4j || p="${p},log4j"
-	use nooro || p="${p},jakarta-oro-2.0"
-	use noregexp || p="${p},jakarta-regexp-1.3*"
-	use norhino || p="${p},rhino-1.5"
-	use noxalan || p="${p},xalan"
-	use noxerces || p="${p},xerces-2"
-
-	use javamail && p="${p},sun-javamail-bin,sun-jaf-bin"
-
-	libs=$(java-config -p ${p})
-	CLASSPATH="." ./build.sh -Ddist.dir=${D}/usr/share/ant-core -lib ${libs} || die "build failed"
-}
-
-src_install() {
-
-	local jars="junit vaj weblogic apache-resolver netrexx  nodeps \
-		starteam xslp stylebook icontract jmf swing jai trax"
-
-	use noantlr || jars="${jars} antlr"
-	use nobcel || jars="${jars} apache-bcel"
-	#use nobsf || jars="${jars} apache-bsf"
-	use nocommonslogging || jars="${jars} commons-logging"
-	use nocommonsnet || jars="${jars} commons-net"
-	use nojdepend || jars="${jars} jdepend"
-	use nojsch || jars="${jars} jsch"
-	use nolog4j || jars="${jars} apache-log4j"
-	use nooro || jars="${jars} apache-oro"
-	use noregexp || jars="${jars} apache-regexp"
-	use noxalan || jars="${jars} xalan1"
-	use javamail && jars="${jars} javamail"
-
-	dodir /usr/share/ant-core/lib
-	for jar in ${jars}; do
-		java-pkg_dojar build/lib/ant-${jar}.jar
-		dosym /usr/share/${PN}/lib/ant-${jar}.jar /usr/share/ant-core/lib/
-	done
-}
-
-pkg_postinst() {
-	local noset=false
-	for x in ${IUSE} ; do
-		if [ "${x:0:2}" == "no" ] ; then
-			use ${x} && noset=true
-		fi
-	done
-	if [ ${noset} == "true" ]; then
-		ewarn "You have disabled some of the ant tasks. Be advised that this may"
-		ewarn "break building some of the Java packages!!"
-		ewarn ""
-		ewarn "We can only offer very limited support in cases where dev-java/ant-tasks"
-		ewarn "has been build with essential features disabled."
-	fi
-}
diff --git a/dev-java/ant-tasks/ant-tasks-1.6.2-r9.ebuild b/dev-java/ant-tasks/ant-tasks-1.6.2-r9.ebuild
index b6759d283113..f2019d2af8b4 100644
--- a/dev-java/ant-tasks/ant-tasks-1.6.2-r9.ebuild
+++ b/dev-java/ant-tasks/ant-tasks-1.6.2-r9.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/ant-tasks/ant-tasks-1.6.2-r9.ebuild,v 1.1 2005/05/14 16:10:22 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ant-tasks-1.6.2-r9.ebuild,v 1.2 2005/07/09 14:10:07 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -13,9 +13,9 @@ SLOT="0"
 KEYWORDS="x86 amd64 ppc sparc ppc64"
 IUSE="javamail noantlr nobcel nobeanutils nobsh nocommonsnet nocommonslogging nojdepend nojsch nojython nolog4j nooro noregexp norhino noxalan noxerces"
 
-DEPEND="=dev-java/ant-core-${PV}*
+RDEPEND=">=virtual/jre-1.4
+	=dev-java/ant-core-${PV}*
 	!dev-java/ant-optional
-	>=dev-java/java-config-1.2
 	>=dev-java/junit-3.8
 	!nolog4j? ( >=dev-java/log4j-1.2.8 )
 	!noxerces? ( >=dev-java/xerces-2.6.2-r1 )
@@ -33,7 +33,9 @@ DEPEND="=dev-java/ant-core-${PV}*
 	!noregexp? ( >=dev-java/jakarta-regexp-1.3-r2 )
 	!nojython? ( >=dev-java/jython-2.1-r5 )
 	javamail? ( >=dev-java/sun-javamail-bin-1.3 )"
-RDEPEND="${DEPEND}"
+DEPEND=">=virtual/jdk-1.4
+	>=dev-java/java-config-1.2
+	${RDEPEND}"
 
 S="${WORKDIR}/apache-ant-${PV}"
 
@@ -53,7 +55,7 @@ src_compile() {
 		export THREADS_FLAG="green"
 	fi
 
-	local p="ant-core,junit"
+	local p="ant-core,junit" libs
 	use noantlr || p="${p},antlr"
 	use nobcel || p="${p},bcel"
 	use nobeanutils || p="${p},commons-beanutils-1.6"
@@ -65,14 +67,14 @@ src_compile() {
 	use nojython || p="${p},jython"
 	use nolog4j || p="${p},log4j"
 	use nooro || p="${p},jakarta-oro-2.0"
-	use noregexp || p="${p},jakarta-regexp-1.3*"
+	use noregexp || p="${p},jakarta-regexp-1.3"
 	use norhino || p="${p},rhino-1.5"
 	use noxalan || p="${p},xalan"
 	use noxerces || p="${p},xerces-2"
 
 	use javamail && p="${p},sun-javamail-bin,sun-jaf-bin"
 
-	libs=$(java-config -p ${p})
+	libs=$(java-pkg_getjars ${p})
 	CLASSPATH="." ./build.sh -Ddist.dir=${D}/usr/share/ant-core -lib ${libs} || die "build failed"
 }
 
diff --git a/dev-java/ant-tasks/ant-tasks-1.6.5.ebuild b/dev-java/ant-tasks/ant-tasks-1.6.5.ebuild
index 9b4a79215394..b170e2a75080 100644
--- a/dev-java/ant-tasks/ant-tasks-1.6.5.ebuild
+++ b/dev-java/ant-tasks/ant-tasks-1.6.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/ant-tasks/ant-tasks-1.6.5.ebuild,v 1.1 2005/06/02 16:22:11 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ant-tasks-1.6.5.ebuild,v 1.2 2005/07/09 14:10:07 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -16,9 +16,9 @@ SLOT="0"
 KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~ppc64"
 IUSE="javamail noantlr nobcel nobeanutils nobsh nobsf nocommonsnet nocommonslogging nojdepend nojsch nojython nolog4j nooro noregexp norhino noxalan noxerces"
 
-DEPEND="=dev-java/ant-core-${PV}*
+RDEPEND=">=virtual/jre-1.4
+	=dev-java/ant-core-${PV}*
 	!dev-java/ant-optional
-	>=dev-java/java-config-1.2
 	>=dev-java/junit-3.8
 	!nolog4j? ( >=dev-java/log4j-1.2.8 )
 	!noxerces? ( >=dev-java/xerces-2.6.2-r1 )
@@ -30,14 +30,16 @@ DEPEND="=dev-java/ant-core-${PV}*
 	!nocommonslogging? ( >=dev-java/commons-logging-1.0.3 )
 	!nocommonsnet? ( >=dev-java/commons-net-1.1.0 )
 	!nobcel? ( >=dev-java/bcel-5.1 )
-	!nooro? ( =dev-java/jakarta-oro-2.0.8-r1 )
+	!nooro? ( >=dev-java/jakarta-oro-2.0.8-r1 )
 	!norhino? ( =dev-java/rhino-1.5* )
 	!nojdepend? ( >=dev-java/jdepend-2.6 )
 	!nojsch? ( >=dev-java/jsch-0.1.12 )
 	!noregexp? ( >=dev-java/jakarta-regexp-1.3-r2 )
 	!nojython? ( >=dev-java/jython-2.1-r5 )
 	javamail? ( >=dev-java/sun-javamail-bin-1.3 )"
-RDEPEND="${DEPEND}"
+DEPEND=">=virtual/jdk-1.4
+	>=dev-java/java-config-1.2
+	${RDEPEND}"
 
 S="${WORKDIR}/apache-ant-${MY_PV}"
 
@@ -54,7 +56,7 @@ src_compile() {
 		export THREADS_FLAG="green"
 	fi
 
-	local p="ant-core,junit"
+	local p="ant-core,junit" libs
 	use noantlr || p="${p},antlr"
 	use nobcel || p="${p},bcel"
 	use nobeanutils || p="${p},commons-beanutils-1.6"
@@ -74,7 +76,7 @@ src_compile() {
 
 	use javamail && p="${p},sun-javamail-bin,sun-jaf-bin"
 
-	libs=$(java-config -p ${p})
+	libs=$(java-pkg_getjars ${p})
 	CLASSPATH="." ./build.sh -Ddist.dir=${D}/usr/share/ant-core -lib ${libs} || die "build failed"
 }
 
diff --git a/dev-java/ant-tasks/files/digest-ant-tasks-1.6.2-r8 b/dev-java/ant-tasks/files/digest-ant-tasks-1.6.2-r8
deleted file mode 100644
index 511c4167d672..000000000000
--- a/dev-java/ant-tasks/files/digest-ant-tasks-1.6.2-r8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 83c3adefdbf90bcbc4b804d4c55c0778 apache-ant-1.6.2-src.tar.bz2 6282237