Revision bump to add support for new Java system.

Package-Manager: portage-2.1.1_pre1

6 files changed, 131 insertions, 33 deletions

diff --git a/dev-java/ant-core/ChangeLog b/dev-java/ant-core/ChangeLog
index 80ba64b91b1b..0ba982a328ad 100644
--- a/dev-java/ant-core/ChangeLog
+++ b/dev-java/ant-core/ChangeLog
@@ -1,11 +1,14 @@
 # ChangeLog for dev-java/ant-core
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.38 2006/03/12 04:21:56 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.39 2006/06/25 01:25:32 nichoj Exp $
 
 # Ant-core blocks lower/older versions of ant-tasks, 
 # since it will not run when there is a version mismatch betwean the 2 packages
 # Please unemerge ant-tasks when updating ant-core.
 
+  25 Jun 2006; <nichoj@gentoo.org> files/1.6.5-ant:
+  Revision bump to add support for new Java system.
+
   12 Mar 2006; <nichoj@gentoo.org> -files/1.5.4-ant,
   -ant-core-1.5.4-r2.ebuild:
   Removing older version with same keywords.
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index e6270bb5d630..bb643405555a 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -1,33 +1,51 @@
-MD5 67cc24d0ee9a7fb34d1f3921a711112f ChangeLog 19737
-RMD160 80fc7162799f79126258be755dc25188a9610017 ChangeLog 19737
-SHA256 5befb2d2226eddbb78b5e0f6a93e5be33fe6ab3c1968d63d87dca4144f9d7c1e ChangeLog 19737
-MD5 45c826152c7de9789493fe41efd87b27 ant-core-1.6.2-r5.ebuild 2082
-RMD160 cd1d8c23383397d05206ed7256a281aeaa90deb4 ant-core-1.6.2-r5.ebuild 2082
-SHA256 e0a55354a9149fcdb77a157c65ff8cf7110fca89a19d2a7f84cffdfbe86d9d2c ant-core-1.6.2-r5.ebuild 2082
-MD5 28fb623be0093d929803aeaefc530b06 ant-core-1.6.5-r2.ebuild 1997
-RMD160 b119db5164d14a4e689386483450d41bcecca347 ant-core-1.6.5-r2.ebuild 1997
-SHA256 02b88a7eb30e246265b9282f20bb01972ff7f5b50157ad095bfeb205c9ced452 ant-core-1.6.5-r2.ebuild 1997
+AUX 1.6.2-ant 5058 RMD160 fb75e9bf3c4a095297be865e0cd87620feab8643 SHA1 fb423fa1d5c4776950bd4b640b58fc7fc1f73ecf SHA256 ea8b41190c6a5b89b7a111a9fc901ad6fa294d3696cfcb9ba58a0f969a305071
 MD5 816ea8a6a51471da4c8df2f59434fc9d files/1.6.2-ant 5058
 RMD160 fb75e9bf3c4a095297be865e0cd87620feab8643 files/1.6.2-ant 5058
 SHA256 ea8b41190c6a5b89b7a111a9fc901ad6fa294d3696cfcb9ba58a0f969a305071 files/1.6.2-ant 5058
+AUX 1.6.2-scp.patch 877 RMD160 ec85134b9c10d603e893ebae068197761efc1b4b SHA1 777d55b752de79518c634d5d7369c3998d79d6a2 SHA256 a11a69f16a3d3e469ed9bdb87282c1e11fef103b19bf108e82ec98434d70950a
 MD5 8c69a473b88559829069ac80730f2f1b files/1.6.2-scp.patch 877
 RMD160 ec85134b9c10d603e893ebae068197761efc1b4b files/1.6.2-scp.patch 877
 SHA256 a11a69f16a3d3e469ed9bdb87282c1e11fef103b19bf108e82ec98434d70950a files/1.6.2-scp.patch 877
-MD5 851886c1a13240befce87e1577f057f1 files/1.6.5-ant 5063
-RMD160 82bfc6233cbb7e8f05099af12564a2cc27c2b53c files/1.6.5-ant 5063
-SHA256 d9a45d747aae54531f3cc4018e1d17d1dc6bacbc64051d50f1d217dce376b942 files/1.6.5-ant 5063
+AUX 1.6.5-ant 5178 RMD160 8ff8c4b5725e85ff6d56f03eb8fa99cda72be9ec SHA1 875a43fd22e87ea17467cc087c3233f7eba2cb17 SHA256 2ae143e2cd6ef9b06072eadcd6aed59bcc070efb3ecf5f53da2a0458b5bfc285
+MD5 c2c1163dd1f532a2fad1bae22025db8e files/1.6.5-ant 5178
+RMD160 8ff8c4b5725e85ff6d56f03eb8fa99cda72be9ec files/1.6.5-ant 5178
+SHA256 2ae143e2cd6ef9b06072eadcd6aed59bcc070efb3ecf5f53da2a0458b5bfc285 files/1.6.5-ant 5178
+AUX build.sh-exit-fix.patch 345 RMD160 4c4cfdfb1b13b9cc55f279a5765afda6da9f6f4d SHA1 3bc6dfe6c9cfe7a55023e95dbfab169493f3555c SHA256 bafac89599d2d5bbb8f17060e39922a01891826251925e39be2df38170d88e2b
 MD5 ea37e3a5b2edbe1b1fca02ba48c4ea47 files/build.sh-exit-fix.patch 345
 RMD160 4c4cfdfb1b13b9cc55f279a5765afda6da9f6f4d files/build.sh-exit-fix.patch 345
 SHA256 bafac89599d2d5bbb8f17060e39922a01891826251925e39be2df38170d88e2b files/build.sh-exit-fix.patch 345
-MD5 aac477e88787ed6f0ad5cabe0f6a001a files/digest-ant-core-1.6.2-r5 74
-RMD160 66d373bf435d3a4609fb0a1da03ff25e3fc783cb files/digest-ant-core-1.6.2-r5 74
-SHA256 a9b153951e9ca3deb84b3506fe73a6f37ed2b21283ab5c584abdf6bbc0c8a4fd files/digest-ant-core-1.6.2-r5 74
-MD5 181609c8f2d789fc7abf5cd39a027130 files/digest-ant-core-1.6.5-r2 74
-RMD160 c64b4cb369c92ec53a5a607900e143dd18da9fd5 files/digest-ant-core-1.6.5-r2 74
-SHA256 0662811901b318c5dc3b4ce05e8b03bdb7dfa600bfe2ceaf66d293b485815d50 files/digest-ant-core-1.6.5-r2 74
+AUX rpmbuild.patch 3116 RMD160 c30ff8e1d3011946753ed250485ef944237b54ab SHA1 ae345c1f542e176cf501526d8416aedb7ce920a9 SHA256 8980a3210e84ce2b8fce34c5f541ebe22c406c281e47e0dbf202aceefeec736e
 MD5 d956471b5a9d9f51778afe97db252d5d files/rpmbuild.patch 3116
 RMD160 c30ff8e1d3011946753ed250485ef944237b54ab files/rpmbuild.patch 3116
 SHA256 8980a3210e84ce2b8fce34c5f541ebe22c406c281e47e0dbf202aceefeec736e files/rpmbuild.patch 3116
+DIST apache-ant-1.6.2-src.tar.bz2 6282237
+DIST apache-ant-1.6.5-src.tar.bz2 6283500 RMD160 4680b53cd72d4915b9ca2bbe2131a71fcf505a84 SHA1 08e838c506ee580f5d220401a974c757ea80365d SHA256 f3ef501f06bf1dac88981038ebd5311c738bf2d50d220de85c3e6c7656169d59
+EBUILD ant-core-1.6.2-r5.ebuild 2082 RMD160 cd1d8c23383397d05206ed7256a281aeaa90deb4 SHA1 241ece8f3eb573f6488ccf597958836fdbd6cba7 SHA256 e0a55354a9149fcdb77a157c65ff8cf7110fca89a19d2a7f84cffdfbe86d9d2c
+MD5 45c826152c7de9789493fe41efd87b27 ant-core-1.6.2-r5.ebuild 2082
+RMD160 cd1d8c23383397d05206ed7256a281aeaa90deb4 ant-core-1.6.2-r5.ebuild 2082
+SHA256 e0a55354a9149fcdb77a157c65ff8cf7110fca89a19d2a7f84cffdfbe86d9d2c ant-core-1.6.2-r5.ebuild 2082
+EBUILD ant-core-1.6.5-r13.ebuild 1865 RMD160 1b3161fcd9e4119f04e7ec97692cb57e5b1ad760 SHA1 66e37ff797902916b1f0ae11d2e626b0479b03ea SHA256 a0d81bc8289d4c214b0e35b00676e8ca2b0c1f27ae775d1fafe44c1c4a3a5bd8
+MD5 f5a2876108eb214fad938c3829d3f29e ant-core-1.6.5-r13.ebuild 1865
+RMD160 1b3161fcd9e4119f04e7ec97692cb57e5b1ad760 ant-core-1.6.5-r13.ebuild 1865
+SHA256 a0d81bc8289d4c214b0e35b00676e8ca2b0c1f27ae775d1fafe44c1c4a3a5bd8 ant-core-1.6.5-r13.ebuild 1865
+EBUILD ant-core-1.6.5-r2.ebuild 1997 RMD160 b119db5164d14a4e689386483450d41bcecca347 SHA1 e66352e9e2485ae68621017652dcf1af70f2aa42 SHA256 02b88a7eb30e246265b9282f20bb01972ff7f5b50157ad095bfeb205c9ced452
+MD5 28fb623be0093d929803aeaefc530b06 ant-core-1.6.5-r2.ebuild 1997
+RMD160 b119db5164d14a4e689386483450d41bcecca347 ant-core-1.6.5-r2.ebuild 1997
+SHA256 02b88a7eb30e246265b9282f20bb01972ff7f5b50157ad095bfeb205c9ced452 ant-core-1.6.5-r2.ebuild 1997
+MISC ChangeLog 19842 RMD160 13fec2f5e071c40ba1c980f915b36a6d60ca48dd SHA1 be2d105ed912c589fe959313ed4c7e1acf8ffc0f SHA256 c9d22235fc6617694a848942433e4db9a2f548eb05adbd9c84d8d1932b75b38e
+MD5 e39f5f0acdb96f03995538c971d16ea2 ChangeLog 19842
+RMD160 13fec2f5e071c40ba1c980f915b36a6d60ca48dd ChangeLog 19842
+SHA256 c9d22235fc6617694a848942433e4db9a2f548eb05adbd9c84d8d1932b75b38e ChangeLog 19842
+MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb metadata.xml 158
+MD5 aac477e88787ed6f0ad5cabe0f6a001a files/digest-ant-core-1.6.2-r5 74
+RMD160 66d373bf435d3a4609fb0a1da03ff25e3fc783cb files/digest-ant-core-1.6.2-r5 74
+SHA256 a9b153951e9ca3deb84b3506fe73a6f37ed2b21283ab5c584abdf6bbc0c8a4fd files/digest-ant-core-1.6.2-r5 74
+MD5 31de0486a830c545c91a089241b3bb9a files/digest-ant-core-1.6.5-r13 268
+RMD160 3a54cfc35c821291722b58076e3524c513ee1dc2 files/digest-ant-core-1.6.5-r13 268
+SHA256 6d25121ad88d0c2a4d0822cff5bb2d50c9f6886369b452882476811f65c1b8f5 files/digest-ant-core-1.6.5-r13 268
+MD5 31de0486a830c545c91a089241b3bb9a files/digest-ant-core-1.6.5-r2 268
+RMD160 3a54cfc35c821291722b58076e3524c513ee1dc2 files/digest-ant-core-1.6.5-r2 268
+SHA256 6d25121ad88d0c2a4d0822cff5bb2d50c9f6886369b452882476811f65c1b8f5 files/digest-ant-core-1.6.5-r2 268
diff --git a/dev-java/ant-core/ant-core-1.6.5-r13.ebuild b/dev-java/ant-core/ant-core-1.6.5-r13.ebuild
new file mode 100644
index 000000000000..33317badecce
--- /dev/null
+++ b/dev-java/ant-core/ant-core-1.6.5-r13.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2006 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-r13.ebuild,v 1.1 2006/06/25 01:25:32 nichoj Exp $
+
+inherit java-pkg-2 eutils toolchain-funcs java-ant-2
+
+MY_PN=${PN/-core}
+
+DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files."
+HOMEPAGE="http://ant.apache.org/"
+SRC_URI="mirror://apache/ant/source/apache-${MY_PN}-${PV}-src.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc source"
+
+DEPEND="virtual/libc
+	${RDEPEND}
+	source? ( app-arch/zip )
+	>=virtual/jdk-1.4"
+RDEPEND=">=virtual/jdk-1.4
+	>=dev-java/java-config-1.2"
+
+S="${WORKDIR}/apache-ant-${PV}"
+
+ant_src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Patch build.sh to die with non-zero exit code in case of errors.
+	# This patch may be useful for all ant versions.
+	epatch ${FILESDIR}/build.sh-exit-fix.patch.gz
+}
+
+src_compile() {
+	if [[ $(tc-arch) == "ppc" ]] ; then
+		# We're compiling _ON_ PPC
+		export THREADS_FLAG="green"
+	fi
+
+	./build.sh -Ddist.dir=${D}/usr/share/${PN} || die "failed to build"
+
+	if use doc; then
+		./build.sh dist_javadocs || die "failed to build docs"
+	fi
+}
+
+src_install() {
+	newbin ${FILESDIR}/${PV}-ant ant || die "failed to install wrapper"
+
+	dodir /usr/share/${PN}/bin
+	for each in antRun runant.pl runant.py complete-ant-cmd.pl ; do
+		dobin ${S}/src/script/${each}
+		dosym /usr/bin/${each} /usr/share/${PN}/bin/${each}
+	done
+
+	dodir /etc/env.d
+	echo "ANT_HOME=\"/usr/share/${PN}\"" > ${D}/etc/env.d/20ant
+
+	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/*
+	use doc && java-pkg_dohtml -r dist/docs/manual/api/*
+}
diff --git a/dev-java/ant-core/files/1.6.5-ant b/dev-java/ant-core/files/1.6.5-ant
index 8b7755b4aeee..14d5d492925e 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.5 2005/12/21 20:45:29 betelgeuse Exp $
+#   $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/files/1.6.5-ant,v 1.6 2006/06/25 01:25:32 nichoj Exp $
 
 # Extract launch and ant arguments, (see details below).
 ant_exec_args=
@@ -68,15 +68,9 @@ else
   fi
 fi
 
-
-if [ -z $JAVA_HOME ] ; then
-	if [ -f $HOME/.gentoo/java-env ] ; then
-		source $HOME/.gentoo/java-env
-	else
-		JAVA_HOME=`java-config --jdk-home`
-		CLASSPATH=`java-config --classpath`:${CLASSPATH}
-	fi
-fi
+# Always get JAVA_HOME from java-config.
+# Use GENTOO_VM to change which VM is used instead.
+export JAVA_HOME="$(java-config -g JAVA_HOME)"
 
 if [ -z $JAVA_HOME ] ; then
   echo 'Error: No JDK found!'
@@ -90,7 +84,16 @@ ANT_HOME=/usr/share/ant-core
 # set ANT_LIB location
 ANT_LIB="${ANT_HOME}/lib"
 
-JAVACMD="`java-config --java`"
+if [ -z "$JAVACMD" ] ; then
+  if [ -n "$JAVA_HOME"  ] ; then
+      JAVACMD="$JAVA_HOME/bin/java"
+  else
+    JAVACMD=`which java 2> /dev/null `
+    if [ -z "$JAVACMD" ] ; then
+        JAVACMD=java
+    fi
+  fi
+fi
 
 if [ ! -x "$JAVACMD" ] ; then
   echo "Error: JAVA_HOME is not defined correctly."
@@ -148,7 +151,6 @@ fi
 # java options, and ant args
 ant_sys_opts=
 
-
 if [ -n "$JIKESPATH" ]; then
 	ant_sys_opts="-Djikes.class.path=\"$JIKESPATH\""
 fi
@@ -156,7 +158,7 @@ fi
 # 2002-11-02, karltk@gentoo.org:
 # The Blackdown JDK on PPC hiccups with native threads
 #
-if [ "`arch`" == "ppc" ] ; then
+if [ "$(arch)" == "ppc" ] ; then
 	export THREADS_FLAG="green"
 fi
 
@@ -164,6 +166,6 @@ 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 -cp \"$CLASSPATH\" $ant_exec_args"
 
 if $ant_exec_debug ; then
-  echo $ant_exec_command
+    echo $ant_exec_command
 fi
 eval $ant_exec_command
diff --git a/dev-java/ant-core/files/digest-ant-core-1.6.5-r13 b/dev-java/ant-core/files/digest-ant-core-1.6.5-r13
new file mode 100644
index 000000000000..6bc546eb9b5c
--- /dev/null
+++ b/dev-java/ant-core/files/digest-ant-core-1.6.5-r13
@@ -0,0 +1,3 @@
+MD5 80a7ad191c40b7d8c82533524b282b6b apache-ant-1.6.5-src.tar.bz2 6283500
+RMD160 4680b53cd72d4915b9ca2bbe2131a71fcf505a84 apache-ant-1.6.5-src.tar.bz2 6283500
+SHA256 f3ef501f06bf1dac88981038ebd5311c738bf2d50d220de85c3e6c7656169d59 apache-ant-1.6.5-src.tar.bz2 6283500
diff --git a/dev-java/ant-core/files/digest-ant-core-1.6.5-r2 b/dev-java/ant-core/files/digest-ant-core-1.6.5-r2
index ad1a77324b0f..6bc546eb9b5c 100644
--- a/dev-java/ant-core/files/digest-ant-core-1.6.5-r2
+++ b/dev-java/ant-core/files/digest-ant-core-1.6.5-r2
@@ -1 +1,3 @@
 MD5 80a7ad191c40b7d8c82533524b282b6b apache-ant-1.6.5-src.tar.bz2 6283500
+RMD160 4680b53cd72d4915b9ca2bbe2131a71fcf505a84 apache-ant-1.6.5-src.tar.bz2 6283500
+SHA256 f3ef501f06bf1dac88981038ebd5311c738bf2d50d220de85c3e6c7656169d59 apache-ant-1.6.5-src.tar.bz2 6283500