Fix wrapper script (again)

Package-Manager: portage-2.0.51.22-r2

10 files changed, 26 insertions, 87 deletions

diff --git a/dev-java/ant-core/ChangeLog b/dev-java/ant-core/ChangeLog
index 0a2af3015f5d..f0a8a0dba7cd 100644
--- a/dev-java/ant-core/ChangeLog
+++ b/dev-java/ant-core/ChangeLog
@@ -1,11 +1,20 @@
 # 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.33 2005/09/10 15:01:13 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.34 2005/09/11 11:26:42 axxo 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.
 
+*ant-core-1.6.5-r2 (11 Sep 2005)
+*ant-core-1.6.2-r5 (11 Sep 2005)
+
+  11 Sep 2005; Thomas Matthijs <axxo@gentoo.org> files/1.6.2-ant,
+  files/1.6.5-ant, -ant-core-1.6.2-r3.ebuild, -ant-core-1.6.2-r4.ebuild,
+  +ant-core-1.6.2-r5.ebuild, -ant-core-1.6.5-r1.ebuild,
+  +ant-core-1.6.5-r2.ebuild:
+  Fix wrapper script (again)
+
   10 Sep 2005; Thomas Matthijs <axxo@gentoo.org> ant-core-1.5.4-r2.ebuild,
   ant-core-1.6.2-r3.ebuild, ant-core-1.6.2-r4.ebuild,
   ant-core-1.6.5-r1.ebuild:
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index 248d9f5947ae..0b1a88c5ad6b 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 6faae273dea0a4f931058e09fefe3dae ant-core-1.6.2-r5.ebuild 2084
 MD5 274bb7b92120e8eecafb2bcf01f31db7 ant-core-1.6.5-r2.ebuild 1999
 MD5 8a460466542e1596853795633ba2cd35 ant-core-1.5.4-r2.ebuild 3113
@@ -12,3 +15,10 @@ MD5 8d86f265f37d0d73cdd2e8a3fd2ff6eb files/digest-ant-core-1.5.4-r2 70
 MD5 aac477e88787ed6f0ad5cabe0f6a001a files/digest-ant-core-1.6.2-r5 74
 MD5 181609c8f2d789fc7abf5cd39a027130 files/digest-ant-core-1.6.5-r2 74
 MD5 8c69a473b88559829069ac80730f2f1b files/1.6.2-scp.patch 877
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDJBSH/rLF9B432nYRAsxYAJ9W/uG/8Ng3/u4mbTJiwdbwe30xagCfSWqP
+gf/sEG6LkrH5AVvTjAdJrsY=
+=vHm5
+-----END PGP SIGNATURE-----
diff --git a/dev-java/ant-core/ant-core-1.6.2-r4.ebuild b/dev-java/ant-core/ant-core-1.6.2-r4.ebuild
deleted file mode 100644
index 50ae767b4822..000000000000
--- a/dev-java/ant-core/ant-core-1.6.2-r4.ebuild
+++ /dev/null
@@ -1,79 +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-core/ant-core-1.6.2-r4.ebuild,v 1.2 2005/09/10 15:00:01 axxo Exp $
-
-inherit java-pkg eutils
-
-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="x86 amd64 ppc sparc ppc64"
-IUSE="doc source"
-
-DEPEND="virtual/libc
-	!<dev-java/ant-1.5.4-r2
-	!<dev-java/ant-tasks-${PV}
-	source? ( app-arch/zip )
-	>=virtual/jdk-1.4"
-RDEPEND=">=virtual/jdk-1.4
-	>=dev-java/java-config-1.2"
-
-S="${WORKDIR}/apache-ant-${PV}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# also see #77365 and
-	# http://sourceforge.net/mailarchive/forum.php?thread_id=6173225&forum_id=12628
-	epatch ${FILESDIR}/${PV}-scp.patch
-
-	# 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() {
-	addwrite "/proc/self/maps"
-	if [ `arch` == "ppc" ] ; then
-		# We're compiling _ON_ PPC
-		export THREADS_FLAG="green"
-	fi
-
-
-	local myc
-	myc="${myc} -Ddist.dir=${D}/usr/share/${PN}"
-	myc="${myc} -Djavac.target=1.4"
-	echo $CLASSPATH
-	CLASSPATH="." ./build.sh -Ddist.dir=${D}/usr/share/${PN} || die
-
-	use doc && ./build.sh dist_javadocs
-}
-
-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/ant-core-1.6.2-r3.ebuild b/dev-java/ant-core/ant-core-1.6.2-r5.ebuild
index fbb1d018869d..c1e173761292 100644
--- a/dev-java/ant-core/ant-core-1.6.2-r3.ebuild
+++ b/dev-java/ant-core/ant-core-1.6.2-r5.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.3 2005/09/10 15:00:01 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.6.2-r5.ebuild,v 1.1 2005/09/11 11:26:42 axxo Exp $
 
 inherit java-pkg eutils
 
diff --git a/dev-java/ant-core/ant-core-1.6.5-r1.ebuild b/dev-java/ant-core/ant-core-1.6.5-r2.ebuild
index 2d4ef21b5ffd..622c815dab49 100644
--- a/dev-java/ant-core/ant-core-1.6.5-r1.ebuild
+++ b/dev-java/ant-core/ant-core-1.6.5-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.6.5-r1.ebuild,v 1.4 2005/09/10 15:00:01 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.6.5-r2.ebuild,v 1.1 2005/09/11 11:26:42 axxo Exp $
 
 inherit java-pkg eutils toolchain-funcs
 
diff --git a/dev-java/ant-core/files/1.6.2-ant b/dev-java/ant-core/files/1.6.2-ant
index 27c93cb4ded1..a91e19986919 100644
--- a/dev-java/ant-core/files/1.6.2-ant
+++ b/dev-java/ant-core/files/1.6.2-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.2-ant,v 1.8 2005/07/25 23:56:27 karltk Exp $
+#   $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/files/1.6.2-ant,v 1.9 2005/09/11 11:26:42 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=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=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,sun-jaf-bin,sun-javamail-bin 2> /dev/null`"
 
 if [ -n "$JAVA_HOME" ] ; then
   if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then
diff --git a/dev-java/ant-core/files/1.6.5-ant b/dev-java/ant-core/files/1.6.5-ant
index e3d1e6ef7c4e..199551bff6fa 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.3 2005/07/12 11:39:37 axxo Exp $
+#   $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/files/1.6.5-ant,v 1.4 2005/09/11 11:26:42 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=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=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,sun-jaf-bin,sun-javamail-bin 2> /dev/null`"
 
 if [ -n "$JAVA_HOME" ] ; then
   if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then
diff --git a/dev-java/ant-core/files/digest-ant-core-1.6.2-r4 b/dev-java/ant-core/files/digest-ant-core-1.6.2-r4
deleted file mode 100644
index 511c4167d672..000000000000
--- a/dev-java/ant-core/files/digest-ant-core-1.6.2-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 83c3adefdbf90bcbc4b804d4c55c0778 apache-ant-1.6.2-src.tar.bz2 6282237
diff --git a/dev-java/ant-core/files/digest-ant-core-1.6.2-r3 b/dev-java/ant-core/files/digest-ant-core-1.6.2-r5
index 511c4167d672..511c4167d672 100644
--- a/dev-java/ant-core/files/digest-ant-core-1.6.2-r3
+++ b/dev-java/ant-core/files/digest-ant-core-1.6.2-r5
diff --git a/dev-java/ant-core/files/digest-ant-core-1.6.5-r1 b/dev-java/ant-core/files/digest-ant-core-1.6.5-r2
index ad1a77324b0f..ad1a77324b0f 100644
--- a/dev-java/ant-core/files/digest-ant-core-1.6.5-r1
+++ b/dev-java/ant-core/files/digest-ant-core-1.6.5-r2