fix symlinks & some cleanup cleanups

6 files changed, 128 insertions, 25 deletions

diff --git a/dev-java/ant-tasks/ChangeLog b/dev-java/ant-tasks/ChangeLog
index 610305919306..a99d2dc5472a 100644
--- a/dev-java/ant-tasks/ChangeLog
+++ b/dev-java/ant-tasks/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-tasks/ChangeLog,v 1.2 2004/08/31 06:14:58 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ChangeLog,v 1.3 2004/08/31 17:57:04 axxo Exp $
+
+*ant-tasks-1.6.2-r4 (31 Aug 2004)
+
+  31 Aug 2004; Thomas Matthijs <axxo@gentoo.org> ant-tasks-1.6.2-r2.ebuild,
+  ant-tasks-1.6.2-r3.ebuild, +ant-tasks-1.6.2-r4.ebuild:
+  fix symlinks & some cleanup cleanups
 
 *ant-tasks-1.6.2-r3 (31 Aug 2004)
 
diff --git a/dev-java/ant-tasks/Manifest b/dev-java/ant-tasks/Manifest
index fbabad4bf586..d1de678047ca 100644
--- a/dev-java/ant-tasks/Manifest
+++ b/dev-java/ant-tasks/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 505045cd223d0bb2461846cef7c3c847 ant-tasks-1.6.2-r3.ebuild 3554
-MD5 2dfd0ee22f8b7ce6d874410722ac984b ant-tasks-1.6.2-r2.ebuild 3539
+MD5 192fc354c2bad53d8742cd8d0416af7d ant-tasks-1.6.2-r3.ebuild 3515
+MD5 786348a238e76c9db52cdc286fa8893a ant-tasks-1.6.2-r2.ebuild 3500
+MD5 2c441c0075de7e873255d8e4cdf89a82 ant-tasks-1.6.2-r4.ebuild 3635
 MD5 6d8a2abd9bf36702203d4e82ef0365bc ChangeLog 5727
 MD5 4dad079a28768d183022cff420f01281 metadata.xml 220
 MD5 aac477e88787ed6f0ad5cabe0f6a001a files/digest-ant-tasks-1.6.2-r2 74
 MD5 aac477e88787ed6f0ad5cabe0f6a001a files/digest-ant-tasks-1.6.2-r3 74
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.5 (GNU/Linux)
-
-iD8DBQFBNBei/rLF9B432nYRAhe+AJ9yneb45wFvvaXz7GYYX+eQbf5buwCgvyOF
-Mc+7c+QqQHEWnYGp9oGDzsY=
-=8wcQ
------END PGP SIGNATURE-----
+MD5 aac477e88787ed6f0ad5cabe0f6a001a files/digest-ant-tasks-1.6.2-r4 74
diff --git a/dev-java/ant-tasks/ant-tasks-1.6.2-r2.ebuild b/dev-java/ant-tasks/ant-tasks-1.6.2-r2.ebuild
index dc3e3e148d3b..328f3eff4e94 100644
--- a/dev-java/ant-tasks/ant-tasks-1.6.2-r2.ebuild
+++ b/dev-java/ant-tasks/ant-tasks-1.6.2-r2.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-tasks/ant-tasks-1.6.2-r2.ebuild,v 1.1 2004/08/30 20:21:47 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ant-tasks-1.6.2-r2.ebuild,v 1.2 2004/08/31 17:57:04 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -36,10 +36,6 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/apache-ant-${PV}"
 
-calc_packages() {
-	echo ${p}
-}
-
 src_compile() {
 	addwrite "/proc/self/maps"
 	export JAVA_HOME=${JDK_HOME}
@@ -93,7 +89,7 @@ src_install() {
 	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/
+		dosym /usr/share/${PN}/lib/ant-${jar}.jar /usr/share/ant/lib/
 	done
 }
 
diff --git a/dev-java/ant-tasks/ant-tasks-1.6.2-r3.ebuild b/dev-java/ant-tasks/ant-tasks-1.6.2-r3.ebuild
index be5dd014f22e..da65a61b13e5 100644
--- a/dev-java/ant-tasks/ant-tasks-1.6.2-r3.ebuild
+++ b/dev-java/ant-tasks/ant-tasks-1.6.2-r3.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-tasks/ant-tasks-1.6.2-r3.ebuild,v 1.1 2004/08/31 06:14:58 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ant-tasks-1.6.2-r3.ebuild,v 1.2 2004/08/31 17:57:04 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -36,10 +36,6 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/apache-ant-${PV}"
 
-calc_packages() {
-	echo ${p}
-}
-
 src_compile() {
 	addwrite "/proc/self/maps"
 	export JAVA_HOME=${JDK_HOME}
@@ -93,7 +89,7 @@ src_install() {
 	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/
+		dosym /usr/share/${PN}/lib/ant-${jar}.jar /usr/share/ant/lib/
 	done
 }
 
diff --git a/dev-java/ant-tasks/ant-tasks-1.6.2-r4.ebuild b/dev-java/ant-tasks/ant-tasks-1.6.2-r4.ebuild
new file mode 100644
index 000000000000..bfdc8c99b029
--- /dev/null
+++ b/dev-java/ant-tasks/ant-tasks-1.6.2-r4.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2004 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.2-r4.ebuild,v 1.1 2004/08/31 17:57:04 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 ~ppc"
+IUSE="javamail noantlr nobcel nobeanutils nobsh nocommonsnet nocommonslogging nojdepend nojsch nojython nolog4j nooro noregexp norhino noxalan noxerces"
+
+DEPEND="=dev-java/ant-1.6.2-r5
+	>=dev-java/java-config-1.2
+	>=dev-java/junit-3.8
+	!nolog4j? ( >=dev-java/log4j-1.2.8 )
+	!noxerces? ( >=dev-java/xerces-2.6.2-r1 )
+	!noxalan? ( >=dev-java/xalan-2.5.2 )
+	!nobsh? ( >=dev-java/bsh-1.2-r7 )
+	!noantlr? ( >=dev-java/antlr-2.7.2 )
+	!nobeanutils? ( >=dev-java/commons-beanutils-1.6.1 )
+	!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/oro-2.0.7 )
+	!norhino? ( >=dev-java/rhino-1.5_rc4 )
+	!nojdepend? ( >=dev-java/jdepend-2.6 )
+	!nojsch? ( >=dev-java/jsch-0.1.12 )
+	!noregexp? ( >=dev-java/regexp-bin-1.3 )
+	!nojython? ( >=dev-java/jython-bin-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
+
+	local p="ant,junit"
+	use noantlr || p="${p},antlr"
+	use nobcel || p="${p},bcel"
+	use nobeanutils || p="${p},commons-beanutils"
+	use nobsh || p="${p},bsh"
+	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-bin"
+	use nolog4j || p="${p},log4j"
+	use nooro || p="${p},oro"
+	use noregexp || p="${p},regexp-bin"
+	use norhino || p="${p},rhino"
+	use noxalan || p="${p},xalan"
+	use noxerces || p="${p},xerces-2"
+
+	use javamail && p="${p},sun-javamail-bin,sun-jaf-bin"
+
+	packages=${p}
+
+	libs=$(java-config -p ${packages})
+	./build.sh -Ddist.dir=${D}/usr/share/ant -lib ${libs} || 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 nobeanutils || jars="${jars} commons-beanutils"
+	#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/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/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.2-r4 b/dev-java/ant-tasks/files/digest-ant-tasks-1.6.2-r4
new file mode 100644
index 000000000000..511c4167d672
--- /dev/null
+++ b/dev-java/ant-tasks/files/digest-ant-tasks-1.6.2-r4
@@ -0,0 +1 @@
+MD5 83c3adefdbf90bcbc4b804d4c55c0778 apache-ant-1.6.2-src.tar.bz2 6282237