fix depend && license

6 files changed, 83 insertions, 6 deletions

diff --git a/dev-java/ant-optional/ChangeLog b/dev-java/ant-optional/ChangeLog
index 7211b8782aa5..61322a9a4d68 100644
--- a/dev-java/ant-optional/ChangeLog
+++ b/dev-java/ant-optional/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/ant-optional
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ChangeLog,v 1.21 2004/07/18 13:13:47 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ChangeLog,v 1.22 2004/07/23 21:28:29 axxo Exp $
+
+*ant-optional-1.6.2-r1 (23 Jul 2004)
+
+  23 Jul 2004; Thomas Matthijs <axxo@gentoo.org>
+  +ant-optional-1.6.2-r1.ebuild, ant-optional-1.6.2.ebuild:
+  fix license
 
   18 Jul 2004; Thomas Matthijs <axxo@gentoo.org> ant-optional-1.6.2.ebuild:
   ~amd64
diff --git a/dev-java/ant-optional/Manifest b/dev-java/ant-optional/Manifest
index 9205ef6543d4..c12f31612a66 100644
--- a/dev-java/ant-optional/Manifest
+++ b/dev-java/ant-optional/Manifest
@@ -1,12 +1,14 @@
 MD5 18cf25cf521f2fce405ff54ba713b6af ant-optional-1.6.0-r2.ebuild 4827
 MD5 f42b995fefed019cb3474c9cc66100b2 ant-optional-1.6.1-r1.ebuild 4675
-MD5 5c6078e8c769ce5fa0c7a1c609bc98b3 ant-optional-1.6.2.ebuild 1974
+MD5 f72638291acf0ad48dc71a0b06cae7ac ant-optional-1.6.2.ebuild 1974
 MD5 9a43937da4c7e9089d8ecfa1bd224af9 ant-optional-1.6.0-r3.ebuild 4610
 MD5 d4583291297ac4e244f8364c2c393f70 ant-optional-1.6.1.ebuild 4605
-MD5 f25b664a4c913c689501904c6b5560e5 ChangeLog 2888
+MD5 e784a9fcb92db3f4f22af8a501272e2e ChangeLog 3050
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 c7249186b952476188942034f199bb82 ant-optional-1.6.2-r1.ebuild 1978
 MD5 c2a3ad39a9e095b30108083f4002b384 files/digest-ant-optional-1.6.0-r2 74
 MD5 c2a3ad39a9e095b30108083f4002b384 files/digest-ant-optional-1.6.0-r3 74
 MD5 742e94a3c64e9b5cddc7ce7863d1afac files/digest-ant-optional-1.6.1-r1 74
+MD5 aac477e88787ed6f0ad5cabe0f6a001a files/digest-ant-optional-1.6.2-r1 74
 MD5 742e94a3c64e9b5cddc7ce7863d1afac files/digest-ant-optional-1.6.1 74
 MD5 aac477e88787ed6f0ad5cabe0f6a001a files/digest-ant-optional-1.6.2 74
diff --git a/dev-java/ant-optional/ant-optional-1.6.2-r1.ebuild b/dev-java/ant-optional/ant-optional-1.6.2-r1.ebuild
new file mode 100644
index 000000000000..f8aa64cdc08b
--- /dev/null
+++ b/dev-java/ant-optional/ant-optional-1.6.2-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ant-optional-1.6.2-r1.ebuild,v 1.1 2004/07/23 21:28:29 axxo 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"
+IUSE="javamail"
+
+DEPEND="=dev-java/ant-${PVR}
+	>=dev-java/java-config-1.2
+	>=dev-java/log4j-1.2.8
+	>=dev-java/xerces-2.6.1
+	>=dev-java/xalan-2.5.2
+	>=dev-java/junit-3.8
+	>=dev-java/bsh-1.2-r7
+	>=dev-java/antlr-2.7.2
+	>=dev-java/commons-beanutils-1.6.1
+	>=dev-java/commons-logging-1.0.3
+	>=dev-java/commons-net-1.1.0
+	>=dev-java/bcel-5.1
+	>=dev-java/oro-2.0.7
+	>=dev-java/rhino-1.5_rc4
+	>=dev-java/jdepend-2.6
+	>=dev-java/jsch-0.1.12
+	>=dev-java/regexp-1.3
+	>=dev-java/jython-2.1
+	javamail? ( >=dev-java/sun-javamail-bin-1.3 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/apache-ant-${PV}"
+
+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
+
+	packages="ant,antlr,bcel,bsh,commons-beanutils,commons-net,commons-logging,jdepend,jsch,junit,jython,log4j,oro,regexp,rhino,xalan,xerces-2"
+	use javamail && packages="${packages},sun-javamail-bin,sun-jaf-bin"
+
+	libs=$(java-config -p ${packages})
+	./build.sh -Ddist.dir=${D}/usr/share/ant -lib ${libs} || die "build failed"
+}
+
+src_install() {
+	local jars="antlr apache-bcel junit vaj apache-bsf apache-log4j weblogic \
+		apache-resolver apache-oro netrexx xalan1 nodeps apache-regexp \
+		commons-logging javamail starteam xslp commons-net jdepend stylebook \
+		icontract jmf swing jai jsch trax"
+
+	dodir /usr/share/ant/lib
+	for jar in ${jars}; do
+		java-pkg_dojar build/lib/ant-${jar}.jar
+		dosym /usr/share/ant-optional/lib/ant-${jar}.jar /usr/share/ant/lib/
+	done
+}
diff --git a/dev-java/ant-optional/ant-optional-1.6.2.ebuild b/dev-java/ant-optional/ant-optional-1.6.2.ebuild
index 737d569c176d..b822a3f85ac0 100644
--- a/dev-java/ant-optional/ant-optional-1.6.2.ebuild
+++ b/dev-java/ant-optional/ant-optional-1.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ant-optional-1.6.2.ebuild,v 1.3 2004/07/18 13:13:47 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ant-optional-1.6.2.ebuild,v 1.4 2004/07/23 21:28:29 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -8,7 +8,7 @@ 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-1.1"
+LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
 IUSE="javamail"
diff --git a/dev-java/ant-optional/files/digest-ant-optional-1.6.2-r1 b/dev-java/ant-optional/files/digest-ant-optional-1.6.2-r1
new file mode 100644
index 000000000000..511c4167d672
--- /dev/null
+++ b/dev-java/ant-optional/files/digest-ant-optional-1.6.2-r1
@@ -0,0 +1 @@
+MD5 83c3adefdbf90bcbc4b804d4c55c0778 apache-ant-1.6.2-src.tar.bz2 6282237
diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest
index 1030a1c76f3a..52f3e76a6246 100644
--- a/dev-java/ant/Manifest
+++ b/dev-java/ant/Manifest
@@ -1,11 +1,12 @@
 MD5 42c27581a32bf53f2a5caf894fb7e2e0 ant-1.5.3-r5.ebuild 2945
 MD5 f1875d8d41873c47c423c573a0022594 ant-1.6.2.ebuild 2210
+MD5 6571a038b72a8ec54ba705a3ca37d958 ant-1.6.2-r1.ebuild 2215
 MD5 050ac1afea674f2d58b6cea499f83cec ant-1.6.0-r2.ebuild 1608
 MD5 0a9e579c0585e31fa0f608df4fc596ab ant-1.5.4-r1.ebuild 3013
 MD5 feb875c667f1fe035a07b0709bfa3b83 ant-1.6.1-r1.ebuild 2233
 MD5 cdb8b5b010df8ff5460d310b98b2f086 ant-1.6.1.ebuild 2222
 MD5 70419153107f6844f4213d5a0a60b768 ant-1.6.0-r3.ebuild 1595
-MD5 3da2a772e2d7ef95ea90de5e45094af7 ChangeLog 11292
+MD5 25235377b7e53ec9d7cdafa546e27997 ChangeLog 11460
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 9796e31a633d28a00242c76325bb85b4 files/20ant 26
 MD5 742e94a3c64e9b5cddc7ce7863d1afac files/digest-ant-1.6.1 74
@@ -17,8 +18,10 @@ MD5 8d86f265f37d0d73cdd2e8a3fd2ff6eb files/digest-ant-1.5.4-r1 70
 MD5 c2a3ad39a9e095b30108083f4002b384 files/digest-ant-1.6.0-r2 74
 MD5 c2a3ad39a9e095b30108083f4002b384 files/digest-ant-1.6.0-r3 74
 MD5 742e94a3c64e9b5cddc7ce7863d1afac files/digest-ant-1.6.1-r1 74
+MD5 aac477e88787ed6f0ad5cabe0f6a001a files/digest-ant-1.6.2-r1 74
 MD5 fd83525620afc338170992218d51f90f files/1.6.0-r2/ant 2444
 MD5 b175a3f82c4b6326054b651bf39217fd files/1.6.0-r3/ant 2444
+MD5 7a4c99f771d994984ae6c0c37a154d5d files/1.6.2-r1/ant 4697
 MD5 b67a6f940547c8b90c5dea6a675917f6 files/1.5.3/ant 2211
 MD5 9cb067e9b0997856af50e7e117263596 files/1.5.3/1_6_backport-jdk142.patch.gz 916
 MD5 f8c9e03bf0f5924ebf9162718bf15169 files/1.5.4/ant 2275