From: Thomas Matthijs <axxo@gentoo.org>
Date: Sat, 10 Sep 2005 14:46:58 +0000 (+0000)
Subject: cleanups
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1d1c9f316de5042588339fc717f6274d406a7adc;p=gentoo.git

cleanups
Package-Manager: portage-2.0.52-r1
---

diff --git a/dev-java/ant-tasks/Manifest b/dev-java/ant-tasks/Manifest
index 8c73e0521a69..fe7a3fbd9f94 100644
--- a/dev-java/ant-tasks/Manifest
+++ b/dev-java/ant-tasks/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 167d0cd7e4812b07f93acaf4b971bc0b ant-tasks-1.6.5.ebuild 3263
 MD5 7e3dc78ffc10165d0dc2d01ddfb4bfc9 ant-tasks-1.6.2-r10.ebuild 3885
 MD5 48fb7b03fa4e4525a512d0463fb353ed ant-tasks-1.6.2-r9.ebuild 3806
@@ -7,3 +10,10 @@ 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-r9 74
 MD5 8c69a473b88559829069ac80730f2f1b files/1.6.2-scp.patch 877
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDIvH6/rLF9B432nYRAh3HAJ9qFkQmELnK+4C5xY47zRN2AEyB5wCeIQdS
+QECpoA23LjjwLGvf/FkRBEo=
+=1rzR
+-----END PGP SIGNATURE-----
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 b170e2a75080..65c7a44c27b8 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.2 2005/07/09 14:10:07 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ant-tasks-1.6.5.ebuild,v 1.3 2005/09/10 14:46:58 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -75,33 +75,16 @@ src_compile() {
 	use noxerces || p="${p},xerces-2"
 
 	use javamail && p="${p},sun-javamail-bin,sun-jaf-bin"
-
-	libs=$(java-pkg_getjars ${p})
-	CLASSPATH="." ./build.sh -Ddist.dir=${D}/usr/share/ant-core -lib ${libs} || die "build failed"
+	
+	CLASSPATH="." ant -Dant.install=${ANT_HOME} -lib $(java-pkg_getjars ${p}) || 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/
+	for jar in build/lib/ant-*.jar; do
+		[[ "$(basename ${jar})" == "ant-launcher.jar" ]] && continue
+		java-pkg_dojar ${jar}
+		dosym /usr/share/${PN}/lib/$(basename ${jar}) /usr/share/ant-core/lib/
 	done
 }