Version bump and repoman fixes. Use REPOMAN DAMNIT.

5 files changed, 127 insertions, 7 deletions

diff --git a/dev-java/ant-optional/Manifest b/dev-java/ant-optional/Manifest
index 93fabc3c8e41..d0a944cc3cd0 100644
--- a/dev-java/ant-optional/Manifest
+++ b/dev-java/ant-optional/Manifest
@@ -1,6 +1,8 @@
-MD5 319af5b89e59a4ced6717e5550bc4fa6 ChangeLog 1201
-MD5 2ac897e9d12845c0e2810cc44b8231ac ant-optional-1.6.0-r2.ebuild 5038
-MD5 58432a03c645723fa7ae56b41d4edd53 ant-optional-1.6.0-r3.ebuild 4820
+MD5 7815d1d49f305a4498003e4a0b9c5899 ant-optional-1.6.0-r2.ebuild 5037
+MD5 20ad07937992097c1c7b83b70d952d56 ant-optional-1.6.0-r3.ebuild 4819
+MD5 6ba29276f3039057b485c5f1117391e1 ant-optional-1.6.1.ebuild 4705
+MD5 26dd2e7bf66523e4b324f041e01b441f ChangeLog 1200
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 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 74
diff --git a/dev-java/ant-optional/ant-optional-1.6.0-r2.ebuild b/dev-java/ant-optional/ant-optional-1.6.0-r2.ebuild
index cf2bbee16b50..dc41531a3f12 100644
--- a/dev-java/ant-optional/ant-optional-1.6.0-r2.ebuild
+++ b/dev-java/ant-optional/ant-optional-1.6.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ant-optional-1.6.0-r2.ebuild,v 1.5 2004/01/22 01:29:58 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ant-optional-1.6.0-r2.ebuild,v 1.6 2004/03/11 02:47:52 zx Exp $
 
 inherit java-pkg
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://apache/ant/source/apache-ant-${PV}-src.tar.bz2"
 HOMEPAGE="http://ant.apache.org"
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="-* amd64 ~x86"
+KEYWORDS="-* ~x86"
 DEPEND="=dev-java/ant-1.6.0-r2
 	>=dev-java/java-config-1.2
 	log4j? ( >=dev-java/log4j-1.2.8 )
diff --git a/dev-java/ant-optional/ant-optional-1.6.0-r3.ebuild b/dev-java/ant-optional/ant-optional-1.6.0-r3.ebuild
index eecec2378911..9db625a2385c 100644
--- a/dev-java/ant-optional/ant-optional-1.6.0-r3.ebuild
+++ b/dev-java/ant-optional/ant-optional-1.6.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ant-optional-1.6.0-r3.ebuild,v 1.4 2004/02/15 09:31:35 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ant-optional-1.6.0-r3.ebuild,v 1.5 2004/03/11 02:47:52 zx Exp $
 
 inherit java-pkg
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://apache/ant/source/apache-ant-${PV}-src.tar.bz2"
 HOMEPAGE="http://ant.apache.org"
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc"
+KEYWORDS="~amd64 ~x86"
 DEPEND="=dev-java/ant-1.6.0-r3
 	>=dev-java/java-config-1.2
 	>=dev-java/log4j-1.2.8
diff --git a/dev-java/ant-optional/ant-optional-1.6.1.ebuild b/dev-java/ant-optional/ant-optional-1.6.1.ebuild
new file mode 100644
index 000000000000..af6c7c641ebd
--- /dev/null
+++ b/dev-java/ant-optional/ant-optional-1.6.1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ant-optional-1.6.1.ebuild,v 1.1 2004/03/11 02:47:52 zx Exp $
+
+inherit java-pkg
+
+IUSE="doc javamail"
+
+S="${WORKDIR}/apache-ant-${PV}"
+DESCRIPTION="Apache ANT Optional Tasks Jar Files"
+SRC_URI="mirror://apache/ant/source/apache-ant-${PV}-src.tar.bz2"
+HOMEPAGE="http://ant.apache.org"
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+DEPEND="=dev-java/ant-${PV}
+	>=dev-java/java-config-1.2
+	>=dev-java/log4j-1.2.8
+	>=dev-java/xerces-2.6
+	>=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.0.0
+	>=dev-java/bcel-5.1
+	>=dev-java/oro-2.0.7
+	>=dev-java/rhino-1.4
+	>=dev-java/jdepend-2.6
+	>=dev-java/jsch-0.1.12
+	>=dev-java/regexp-1.3
+	>=dev-java/jython-2.1
+	javamail? ( >=dev-java/javamail-1.3 )"
+RDEPEND="${DEPEND}"
+
+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() {
+
+	addwrite "/proc/self/maps"
+	export JAVA_HOME=${JDK_HOME}
+	if [ `arch` == "ppc" ] ; then
+		# We're compiling _ON_ PPC
+		export THREADS_FLAG="green"
+	fi
+
+	for i in "ant,antlr,bcel,bsh,commons-beanutils,commons-logging,javamail,jaf,jdepend,jsch,junit,jython,log4j,oro,regexp,rhino,xalan,xerces"; do
+		export CLASSPATH="${CLASSPATH}`java-config --classpath=${i}`"
+	done
+	./build.sh -Ddist.dir=${D}/usr/share/ant || die
+}
+
+src_install() {
+	dodir /usr/share/ant/lib
+	java-pkg_dojar build/lib/ant-antlr.jar
+	dosym /usr/share/ant-optional/lib/ant-antlr.jar /usr/share/ant/lib/
+	java-pkg_dojar build/lib/ant-jakarta-bcel.jar
+	dosym /usr/share/ant-optional/lib/ant-jakarta-bcel.jar /usr/share/ant/lib/
+	java-pkg_dojar build/lib/ant-junit.jar
+	dosym /usr/share/ant-optional/lib/ant-junit.jar /usr/share/ant/lib/
+	java-pkg_dojar build/lib/ant-vaj.jar
+	dosym /usr/share/ant-optional/lib/ant-vaj.jar /usr/share/ant/lib/
+	java-pkg_dojar build/lib/ant-apache-bsf.jar
+	dosym /usr/share/ant-optional/lib/ant-apache-bsf.jar /usr/share/ant/lib/
+	java-pkg_dojar build/lib/ant-jakarta-log4j.jar
+	dosym /usr/share/ant-optional/lib/ant-jakarta-log4j.jar /usr/share/ant/lib/
+	java-pkg_dojar build/lib/ant-weblogic.jar
+	dosym /usr/share/ant-optional/lib/ant-weblogic.jar /usr/share/ant/lib/
+	java-pkg_dojar build/lib/ant-apache-resolver.jar
+	dosym /usr/share/ant-optional/lib/ant-apache-resolver.jar /usr/share/ant/lib/
+	java-pkg_dojar build/lib/ant-jakarta-oro.jar
+	dosym /usr/share/ant-optional/lib/ant-jakarta-oro.jar /usr/share/ant/lib/
+	java-pkg_dojar build/lib/ant-netrexx.jar
+	dosym /usr/share/ant-optional/lib/ant-netrexx.jar /usr/share/ant/lib/
+	java-pkg_dojar build/lib/ant-xalan1.jar
+	dosym /usr/share/ant-optional/lib/ant-xalan1.jar /usr/share/ant/lib/
+	java-pkg_dojar build/lib/ant-nodeps.jar
+	dosym /usr/share/ant-optional/lib/ant-nodeps.jar /usr/share/ant/lib/
+	java-pkg_dojar build/lib/ant-jakarta-regexp.jar
+	dosym /usr/share/ant-optional/lib/ant-jakarta-regexp.jar /usr/share/ant/lib/
+	java-pkg_dojar build/lib/ant-xalan2.jar
+	dosym /usr/share/ant-optional/lib/ant-xalan2.jar /usr/share/ant/lib/
+	java-pkg_dojar build/lib/ant-commons-logging.jar
+	dosym /usr/share/ant-optional/lib/ant-commons-logging.jar /usr/share/ant/lib/
+	java-pkg_dojar build/lib/ant-javamail.jar
+	dosym /usr/share/ant-optional/lib/ant-javamail.jar /usr/share/ant/lib/
+	java-pkg_dojar build/lib/ant-starteam.jar
+	dosym /usr/share/ant-optional/lib/ant-starteam.jar /usr/share/ant/lib/
+	java-pkg_dojar build/lib/ant-xslp.jar
+	dosym /usr/share/ant-optional/lib/ant-xslp.jar /usr/share/ant/lib/
+	java-pkg_dojar build/lib/ant-commons-net.jar
+	dosym /usr/share/ant-optional/lib/ant-commons-net.jar /usr/share/ant/lib/
+	java-pkg_dojar build/lib/ant-jdepend.jar
+	dosym /usr/share/ant-optional/lib/ant-jdepend.jar /usr/share/ant/lib/
+	java-pkg_dojar build/lib/ant-stylebook.jar
+	dosym /usr/share/ant-optional/lib/ant-stylebook.jar /usr/share/ant/lib/
+	java-pkg_dojar build/lib/ant-icontract.jar
+	dosym /usr/share/ant-optional/lib/ant-icontract.jar /usr/share/ant/lib/
+	java-pkg_dojar build/lib/ant-jmf.jar
+	dosym /usr/share/ant-optional/lib/ant-jmf.jar /usr/share/ant/lib/
+	java-pkg_dojar build/lib/ant-swing.jar
+	dosym /usr/share/ant-optional/lib/ant-swing.jar /usr/share/ant/lib/
+	java-pkg_dojar build/lib/ant-jai.jar
+	dosym /usr/share/ant-optional/lib/ant-jai.jar /usr/share/ant/lib/
+	java-pkg_dojar build/lib/ant-jsch.jar
+	dosym /usr/share/ant-optional/lib/ant-jsch.jar /usr/share/ant/lib/
+	java-pkg_dojar build/lib/ant-trax.jar
+	dosym /usr/share/ant-optional/lib/ant-trax.jar /usr/share/ant/lib/
+}
diff --git a/dev-java/ant-optional/files/digest-ant-optional-1.6.1 b/dev-java/ant-optional/files/digest-ant-optional-1.6.1
new file mode 100644
index 000000000000..60b89a8cc1ed
--- /dev/null
+++ b/dev-java/ant-optional/files/digest-ant-optional-1.6.1
@@ -0,0 +1 @@
+MD5 3e1f06aae6b691543299ccb1a5cb038f apache-ant-1.6.1-src.tar.bz2 6203438