fix deps, add source useflag

Package-Manager: portage-2.0.51.22-r1

6 files changed, 37 insertions, 27 deletions

diff --git a/dev-java/ant-core/ChangeLog b/dev-java/ant-core/ChangeLog
index ee22d8ca62f4..c664ff96cd0f 100644
--- a/dev-java/ant-core/ChangeLog
+++ b/dev-java/ant-core/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ant-core
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.25 2005/06/02 16:24:48 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.26 2005/07/09 15:46:06 axxo Exp $
+
+  09 Jul 2005; Thomas Matthijs <axxo@gentoo.org> ant-core-1.5.4-r2.ebuild,
+  ant-core-1.6.2-r3.ebuild, ant-core-1.6.5.ebuild:
+  Fix deps, add source useflag
 
   02 Jun 2005; Thomas Matthijs <axxo@gentoo.org> -files/1.6.3-ant,
   -files/1.6.4-ant, -ant-core-1.6.3-r1.ebuild, -ant-core-1.6.4.ebuild:
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index c41a0e6a5668..ad86f32bd900 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 e9577f39414ff99938fdadbd15ce5359 ant-core-1.5.4-r2.ebuild 3054
-MD5 9672c7d88215ff6d6ad5e5cb8dac1360 ant-core-1.6.5.ebuild 1884
-MD5 d7a1be742cbb1bb5559d98a30c3f9f8f ant-core-1.6.2-r3.ebuild 2006
-MD5 65dc7eccdbdb2ac4e24afd08abc745a1 ChangeLog 17479
+MD5 a91d5f2459c3e4e8729668a7ccda42cf ant-core-1.5.4-r2.ebuild 3088
+MD5 15db722923469a5b0b73796e0e3b4a81 ant-core-1.6.5.ebuild 1942
+MD5 3cfecf9dbb1e8ae16fe19fdb8a17f8a2 ant-core-1.6.2-r3.ebuild 2059
+MD5 0b78e5791300dedf7eefbea5ef79f42b ChangeLog 17637
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 MD5 d7186edf4c71dc0531330f90e2c08fe9 files/1.5.4-ant 2283
 MD5 266150e6155c8ed106991dc0cac5814f files/1.6.2-ant 5066
-MD5 26b8f3b8818b7ff3b2e1f9f498c48185 files/1.6.5-ant 5061
+MD5 994ab60d3b68dbb5db92a31065b81fad files/1.6.5-ant 5051
 MD5 4383441650437fec5622070e48e4324c files/build.sh-exit-fix.patch.gz 256
 MD5 55ece9ccf573b244b3dff966839528c5 files/rpmbuild.patch.gz 1164
 MD5 8d86f265f37d0d73cdd2e8a3fd2ff6eb files/digest-ant-core-1.5.4-r2 70
@@ -18,7 +18,7 @@ MD5 181609c8f2d789fc7abf5cd39a027130 files/digest-ant-core-1.6.5 74
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCnzLp/rLF9B432nYRAimoAJ91ujpvtLIVCUHFysl/Tk3Zhpm6sQCgwru2
-oECi6Q9V6oGqHemRDUQt6gs=
-=G1N1
+iD8DBQFCz/Fk/rLF9B432nYRAjO1AJ0YYf+Ok0DMj7W3hZaakODq39MLLACgpARa
+lBwP9LaWPavEJZQuyY28//o=
+=iHkE
 -----END PGP SIGNATURE-----
diff --git a/dev-java/ant-core/ant-core-1.5.4-r2.ebuild b/dev-java/ant-core/ant-core-1.5.4-r2.ebuild
index 5cbb8fa083c8..4bbb2ec5904a 100644
--- a/dev-java/ant-core/ant-core-1.5.4-r2.ebuild
+++ b/dev-java/ant-core/ant-core-1.5.4-r2.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-core/ant-core-1.5.4-r2.ebuild,v 1.3 2005/01/01 18:07:10 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.5.4-r2.ebuild,v 1.4 2005/07/09 15:46:06 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -12,13 +12,13 @@ SRC_URI="http://archive.apache.org/dist/ant/source/apache-${MY_PN}-${PV}-src.zip
 LICENSE="Apache-1.1"
 SLOT="0"
 KEYWORDS="x86 ppc sparc amd64"
-IUSE="doc"
+IUSE="doc source"
 
 DEPEND="virtual/libc
 	>=virtual/jdk-1.3
+	source? ( app-arch/zip )
 	>=app-arch/unzip-5.50-r1"
-RDEPEND=">=virtual/jdk-1.3
-	app-shells/bash"
+RDEPEND=">=virtual/jdk-1.3"
 
 S="${WORKDIR}/apache-ant-${PV}"
 
@@ -98,7 +98,9 @@ src_install() {
 
 	java-pkg_dojar build/lib/*.jar
 
-	dodoc LICENSE LICENSE.* README WHATSNEW KEYS
+	use source && java-pkg_dosrc src/main/*
+
+	dodoc README WHATSNEW KEYS
 	use doc && dohtml welcome.html
 	use doc && java-pkg_dohtml -r docs/*
 }
diff --git a/dev-java/ant-core/ant-core-1.6.2-r3.ebuild b/dev-java/ant-core/ant-core-1.6.2-r3.ebuild
index 84d717a47078..d2ed03f010db 100644
--- a/dev-java/ant-core/ant-core-1.6.2-r3.ebuild
+++ b/dev-java/ant-core/ant-core-1.6.2-r3.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-core/ant-core-1.6.2-r3.ebuild,v 1.1 2005/05/14 16:09:55 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.6.2-r3.ebuild,v 1.2 2005/07/09 15:46:06 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -13,13 +13,13 @@ SRC_URI="mirror://apache/ant/source/apache-${MY_PN}-${PV}-src.tar.bz2"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="x86 amd64 ppc sparc ppc64"
-IUSE="doc"
+IUSE="doc source"
 
 DEPEND="virtual/libc
-	>=virtual/jdk-1.4
-	>=dev-java/java-config-1.2"
+	!<dev-java/ant-tasks-${PV}
+	source? ( app-arch/zip )
+	>=virtual/jdk-1.4"
 RDEPEND=">=virtual/jdk-1.4
-	app-shells/bash
 	>=dev-java/java-config-1.2"
 
 S="${WORKDIR}/apache-ant-${PV}"
@@ -69,6 +69,8 @@ src_install() {
 	java-pkg_dojar build/lib/ant.jar
 	java-pkg_dojar build/lib/ant-launcher.jar
 
+	use source && java-pkg_dosrc src/main/*
+
 	dodoc README WHATSNEW KEYS
 	use doc && dohtml welcome.html
 	use doc && java-pkg_dohtml -r docs/*
diff --git a/dev-java/ant-core/ant-core-1.6.5.ebuild b/dev-java/ant-core/ant-core-1.6.5.ebuild
index 349d594d5771..f682be255a85 100644
--- a/dev-java/ant-core/ant-core-1.6.5.ebuild
+++ b/dev-java/ant-core/ant-core-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-core/ant-core-1.6.5.ebuild,v 1.1 2005/06/02 16:21:30 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.6.5.ebuild,v 1.2 2005/07/09 15:46:06 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -15,13 +15,13 @@ SRC_URI="mirror://apache/ant/source/apache-${MY_PN}-${PV}-src.tar.bz2"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~ppc64"
-IUSE="doc"
+IUSE="doc source"
 
 DEPEND="virtual/libc
-	>=virtual/jdk-1.4
-	>=dev-java/java-config-1.2"
+	!<dev-java/ant-tasks-${PV}
+	source? ( app-arch/zip )
+	>=virtual/jdk-1.4"
 RDEPEND=">=virtual/jdk-1.4
-	app-shells/bash
 	>=dev-java/java-config-1.2"
 
 S="${WORKDIR}/apache-ant-${MY_PV}"
@@ -67,6 +67,8 @@ src_install() {
 	java-pkg_dojar build/lib/ant.jar
 	java-pkg_dojar build/lib/ant-launcher.jar
 
+	use source && java-pkg_dosrc src/main/*
+
 	dodoc README WHATSNEW KEYS
 	use doc && dohtml welcome.html
 	use doc && java-pkg_dohtml -r docs/*
diff --git a/dev-java/ant-core/files/1.6.5-ant b/dev-java/ant-core/files/1.6.5-ant
index 49c23e42b3c6..0d5077d61826 100644
--- a/dev-java/ant-core/files/1.6.5-ant
+++ b/dev-java/ant-core/files/1.6.5-ant
@@ -15,7 +15,7 @@
 #   limitations under the License.
 
 #   Edited for Gentoo Linux
-#   $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/files/1.6.5-ant,v 1.1 2005/06/02 16:21:30 axxo Exp $
+#   $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/files/1.6.5-ant,v 1.2 2005/07/09 15:46:06 axxo Exp $
 
 # Extract launch and ant arguments, (see details below).
 ant_exec_args=
@@ -105,7 +105,7 @@ else
 fi
 
 # add in the dependency .jar files
-LOCALCLASSPATH="${LOCALCLASSPATH}:`java-config --classpath=ant-core,ant-tasks,log4j,xerces-2,xalan,junit,antlr,bcel,bsh,commons-beanutils-1.6,commons-collections,commons-logging,commons-net,jakarta-oro-2.0,jdepend,jsch,jakarta-regexp-1.3,rhino-1.5,jython,jta,jaf,javamail 2> /dev/null`"
+LOCALCLASSPATH="${LOCALCLASSPATH}:`java-config --classpath=ant-tasks,log4j,xerces-2,xalan,junit,antlr,bcel,bsh,commons-beanutils-1.6,commons-collections,commons-logging,commons-net,jakarta-oro-2.0,jdepend,jsch,jakarta-regexp-1.3,rhino-1.5,jython,jta,jaf,javamail 2> /dev/null`"
 
 if [ -n "$JAVA_HOME" ] ; then
   if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then
@@ -161,7 +161,7 @@ if [ "`arch`" == "ppc" ] ; then
 fi
 
 
-ant_exec_command="exec \"$JAVACMD\" $ANT_OPTS -classpath \"$LOCALCLASSPATH\" -Dant.home=\"$ANT_HOME\" -Dant.library.dir=\"$ANT_LIB\" $ant_sys_opts org.apache.tools.ant.launch.Launcher $ANT_ARGS -lib \"$CLASSPATH\" $ant_exec_args"
+ant_exec_command="exec \"$JAVACMD\" $ANT_OPTS -classpath \"$LOCALCLASSPATH\" -Dant.home=\"$ANT_HOME\" -Dant.library.dir=\"$ANT_LIB\" $ant_sys_opts org.apache.tools.ant.launch.Launcher $ANT_ARGS -cp \"$CLASSPATH\" $ant_exec_args"
 
 if $ant_exec_debug ; then
   echo $ant_exec_command