Add missing dependency on xml-commons-external and switch to from source sun-jaf.

Package-Manager: portage-2.1.3.16

4 files changed, 142 insertions, 5 deletions

diff --git a/dev-java/ant-tasks/ChangeLog b/dev-java/ant-tasks/ChangeLog
index 614c703bba4e..2ddafe6c2939 100644
--- a/dev-java/ant-tasks/ChangeLog
+++ b/dev-java/ant-tasks/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/ant-tasks
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ChangeLog,v 1.66 2007/05/12 18:21:23 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ChangeLog,v 1.67 2007/10/30 01:18:19 betelgeuse Exp $
+
+*ant-tasks-1.6.5-r4 (30 Oct 2007)
+
+  30 Oct 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +ant-tasks-1.6.5-r4.ebuild:
+  Add missing dependency on xml-commons-external and switch to from source
+  sun-jaf.
 
   12 May 2007; William L. Thomson Jr. <wltjr@gentoo.org>
   ant-tasks-1.7.0-r2.ebuild:
@@ -159,6 +166,8 @@
   ant-tasks-1.6.5-r2.ebuild:
   Replace arch with uname -m for Gentoo/FreeBSD compatibility. See bug #141422.
 
+*ant-tasks-1.6.5-r2 (26 Jun 2006)
+
   26 Jun 2006; Joshua Nichols <nichoj@gentoo.org>
   +ant-tasks-1.6.5-r2.ebuild:
   Revision bump to add support for new Java system.
diff --git a/dev-java/ant-tasks/Manifest b/dev-java/ant-tasks/Manifest
index f24c22395181..53b5909ff68a 100644
--- a/dev-java/ant-tasks/Manifest
+++ b/dev-java/ant-tasks/Manifest
@@ -1,16 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST apache-ant-1.6.5-src.tar.bz2 6283500 RMD160 4680b53cd72d4915b9ca2bbe2131a71fcf505a84 SHA1 08e838c506ee580f5d220401a974c757ea80365d SHA256 f3ef501f06bf1dac88981038ebd5311c738bf2d50d220de85c3e6c7656169d59
 EBUILD ant-tasks-1.6.5-r3.ebuild 3400 RMD160 ffee67fc0b494fdc5d121d05605ee6d482fe1e38 SHA1 7813260b0296672908e166b6274c9e4b47ccd60b SHA256 d8bf0bec8c08c2e6b178e3444838ab7e2993604c723187f31455b929dec1e3f8
 MD5 a2f8c0fbcfe0dcd302678607d6ee7c8f ant-tasks-1.6.5-r3.ebuild 3400
 RMD160 ffee67fc0b494fdc5d121d05605ee6d482fe1e38 ant-tasks-1.6.5-r3.ebuild 3400
 SHA256 d8bf0bec8c08c2e6b178e3444838ab7e2993604c723187f31455b929dec1e3f8 ant-tasks-1.6.5-r3.ebuild 3400
+EBUILD ant-tasks-1.6.5-r4.ebuild 3432 RMD160 b572e9ae7ee208f947f36b5b968428df2eb01ede SHA1 f82348f6065e96c09b3cdf52285bad82e3cc02c1 SHA256 5f22eb5abbb28bad31ae819024f62809e888b70941828433c54154461c3932e1
+MD5 d1dbff5fcf1fabcf4794b63fe2d8aab7 ant-tasks-1.6.5-r4.ebuild 3432
+RMD160 b572e9ae7ee208f947f36b5b968428df2eb01ede ant-tasks-1.6.5-r4.ebuild 3432
+SHA256 5f22eb5abbb28bad31ae819024f62809e888b70941828433c54154461c3932e1 ant-tasks-1.6.5-r4.ebuild 3432
 EBUILD ant-tasks-1.7.0-r2.ebuild 3982 RMD160 55912c3e17fd2caa2b979c9ddc2bae09ff2f3f7d SHA1 e41d22b933dac76482c545e4782b8c6e56c98c23 SHA256 f58b07e5e420048216bccb3a20fa4728738eb9b8b2bd7126aed566e800d0aaa0
 MD5 ed8067565a88bfafdd8c5a65fce54216 ant-tasks-1.7.0-r2.ebuild 3982
 RMD160 55912c3e17fd2caa2b979c9ddc2bae09ff2f3f7d ant-tasks-1.7.0-r2.ebuild 3982
 SHA256 f58b07e5e420048216bccb3a20fa4728738eb9b8b2bd7126aed566e800d0aaa0 ant-tasks-1.7.0-r2.ebuild 3982
-MISC ChangeLog 15309 RMD160 6657ecc91459267c20eac5bf8aecb889a1aee162 SHA1 69097d984704b01e2f0a7772de517d8fe01c5f79 SHA256 8751061441b9800488a8adc7dbe5c96c1b26a4b39739c878583ba239b44be827
-MD5 9e3008d67a53d5a07f48415c4f0aebcb ChangeLog 15309
-RMD160 6657ecc91459267c20eac5bf8aecb889a1aee162 ChangeLog 15309
-SHA256 8751061441b9800488a8adc7dbe5c96c1b26a4b39739c878583ba239b44be827 ChangeLog 15309
+MISC ChangeLog 15554 RMD160 608dd5c484fa0dbde7fb18d77848e07817a5b75f SHA1 f58e6b50f0f95a107507d45371fd124d8ebe1108 SHA256 8837db006402f8410e7fbb3f8545d0a8618694c283c13570722c50455c8e691f
+MD5 08e880de5b4338cb9bed5463b0d93e25 ChangeLog 15554
+RMD160 608dd5c484fa0dbde7fb18d77848e07817a5b75f ChangeLog 15554
+SHA256 8837db006402f8410e7fbb3f8545d0a8618694c283c13570722c50455c8e691f ChangeLog 15554
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -18,6 +25,16 @@ SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb metadata
 MD5 31de0486a830c545c91a089241b3bb9a files/digest-ant-tasks-1.6.5-r3 268
 RMD160 3a54cfc35c821291722b58076e3524c513ee1dc2 files/digest-ant-tasks-1.6.5-r3 268
 SHA256 6d25121ad88d0c2a4d0822cff5bb2d50c9f6886369b452882476811f65c1b8f5 files/digest-ant-tasks-1.6.5-r3 268
+MD5 31de0486a830c545c91a089241b3bb9a files/digest-ant-tasks-1.6.5-r4 268
+RMD160 3a54cfc35c821291722b58076e3524c513ee1dc2 files/digest-ant-tasks-1.6.5-r4 268
+SHA256 6d25121ad88d0c2a4d0822cff5bb2d50c9f6886369b452882476811f65c1b8f5 files/digest-ant-tasks-1.6.5-r4 268
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ant-tasks-1.7.0-r2 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-ant-tasks-1.7.0-r2 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-ant-tasks-1.7.0-r2 0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFHJoZacxLzpIGCsLQRAtokAJ9LyAZEKuc6t6rpPsSg9GpFX9RtqgCgj5gg
+hQJIrJfl8aFzHV9kOFOYgy8=
+=Zsxh
+-----END PGP SIGNATURE-----
diff --git a/dev-java/ant-tasks/ant-tasks-1.6.5-r4.ebuild b/dev-java/ant-tasks/ant-tasks-1.6.5-r4.ebuild
new file mode 100644
index 000000000000..0d0adc53104f
--- /dev/null
+++ b/dev-java/ant-tasks/ant-tasks-1.6.5-r4.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2007 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-r4.ebuild,v 1.1 2007/10/30 01:18:19 betelgeuse Exp $
+
+inherit java-pkg-2 eutils
+
+MY_PV=${PV/_/}
+MY_P=${PN}-${MY_PV}
+
+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="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="javamail noantlr nobcel nobeanutils nobsh nobsf nocommonsnet nocommonslogging nojdepend nojsch nojython nolog4j nooro noregexp norhino noxalan noxerces"
+
+CDEPEND="=dev-java/ant-core-${PV}*
+	>=dev-java/junit-3.8
+	!nolog4j? ( >=dev-java/log4j-1.2.8 )
+	!noxerces? ( >=dev-java/xerces-2.7.1 =dev-java/xml-commons-external-1.3* )
+	!noxalan? ( >=dev-java/xalan-2.5.2 )
+	!nobsh? ( >=dev-java/bsh-1.2-r7 )
+	!nobsf? ( >=dev-java/bsf-2.3.0-r2 )
+	!noantlr? ( >=dev-java/antlr-2.7.2 )
+	!nobeanutils? ( =dev-java/commons-beanutils-1.6* )
+	!nocommonslogging? ( >=dev-java/commons-logging-1.0.3 )
+	!nocommonsnet? ( >=dev-java/commons-net-1.1.0 )
+	!nobcel? ( >=dev-java/bcel-5.1 )
+	!nooro? ( >=dev-java/jakarta-oro-2.0.8-r1 )
+	!norhino? ( =dev-java/rhino-1.5* )
+	!nojdepend? ( >=dev-java/jdepend-2.6 )
+	!nojsch? ( >=dev-java/jsch-0.1.12 )
+	!noregexp? ( =dev-java/jakarta-regexp-1.3* )
+	!nojython? ( >=dev-java/jython-2.1-r5 )
+	javamail? ( dev-java/sun-javamail dev-java/sun-jaf )"
+RDEPEND=">=virtual/jre-1.4
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.4
+	>=dev-java/java-config-1.2
+	!dev-java/ant-optional
+	${CDEPEND}"
+
+S="${WORKDIR}/apache-ant-${MY_PV}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	rm -v lib/*.jar
+}
+
+src_compile() {
+	addwrite "/proc/self/maps"
+	if [[ $(uname -m) == "ppc" ]] ; then
+		# We're compiling _ON_ PPC
+		export THREADS_FLAG="green"
+	fi
+
+	local p="ant-core,junit" libs
+	use noantlr || p="${p},antlr"
+	use nobcel || p="${p},bcel"
+	use nobeanutils || p="${p},commons-beanutils-1.6"
+	use nobsh || p="${p},bsh"
+	use nobsf || p="${p},bsf-2.3"
+	use nocommonslogging || p="${p},commons-logging"
+	use nocommonsnet || p="${p},commons-net"
+	use nojdepend || p="${p},jdepend"
+	use nojsch || p="${p},jsch"
+	use nojython || p="${p},jython"
+	use nolog4j || p="${p},log4j"
+	use nooro || p="${p},jakarta-oro-2.0"
+	use noregexp || p="${p},jakarta-regexp-1.3"
+	use norhino || p="${p},rhino-1.5"
+	use noxalan || p="${p},xalan"
+	use noxerces || p="${p},xml-commons-external-1.3,xerces-2"
+
+	use javamail && p="${p},sun-javamail,sun-jaf"
+
+	CLASSPATH="${JAVA_HOME}/lib/tools.jar:.:$(java-pkg_getjars ant-core,${p})" \
+		java org.apache.tools.ant.launch.Launcher  -Dant.install=${ANT_HOME} \
+		|| die "Build failed."
+}
+
+src_install() {
+	dodir /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
+}
+
+pkg_postinst() {
+	local noset=false
+	for x in ${IUSE} ; do
+		if [ "${x:0:2}" == "no" ] ; then
+			use ${x} && noset=true
+		fi
+	done
+	if [ ${noset} == "true" ]; then
+		ewarn "You have disabled some of the ant tasks. Be advised that this may"
+		ewarn "break building some of the Java packages!!"
+		ewarn ""
+		ewarn "We can only offer very limited support in cases where dev-java/ant-tasks"
+		ewarn "has been build with essential features disabled."
+	fi
+}
diff --git a/dev-java/ant-tasks/files/digest-ant-tasks-1.6.5-r4 b/dev-java/ant-tasks/files/digest-ant-tasks-1.6.5-r4
new file mode 100644
index 000000000000..6bc546eb9b5c
--- /dev/null
+++ b/dev-java/ant-tasks/files/digest-ant-tasks-1.6.5-r4
@@ -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