summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Matthijs <axxo@gentoo.org>2004-07-17 14:53:22 +0000
committerThomas Matthijs <axxo@gentoo.org>2004-07-17 14:53:22 +0000
commit77b77ae770b54717b07ac951e26dec22c07ffe7f (patch)
tree206e0d145375f3825c0bb515233b39c0a5cabc30
parentInitial import of x11-plugins/wmmp3, version 0.12. Closes #19009 (Manifest re... (diff)
downloadgentoo-2-77b77ae770b54717b07ac951e26dec22c07ffe7f.tar.gz
gentoo-2-77b77ae770b54717b07ac951e26dec22c07ffe7f.tar.bz2
gentoo-2-77b77ae770b54717b07ac951e26dec22c07ffe7f.zip
Change it so it doesn't look for javamail when javamail useflag is not defined, closed 57385
-rw-r--r--dev-java/ant-optional/ChangeLog6
-rw-r--r--dev-java/ant-optional/Manifest2
-rw-r--r--dev-java/ant-optional/ant-optional-1.6.2.ebuild7
3 files changed, 11 insertions, 4 deletions
diff --git a/dev-java/ant-optional/ChangeLog b/dev-java/ant-optional/ChangeLog
index 1512bc983cd4..be3abf4c882e 100644
--- a/dev-java/ant-optional/ChangeLog
+++ b/dev-java/ant-optional/ChangeLog
@@ -1,6 +1,10 @@
# 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.19 2004/07/17 09:57:51 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ChangeLog,v 1.20 2004/07/17 14:53:22 axxo Exp $
+
+ 17 Jul 2004; Thomas Matthijs <axxo@gentoo.org> ant-optional-1.6.2.ebuild:
+ Change it so it doesn't look for javamail when javamail useflag is not
+ defined, closed 57385
*ant-optional-1.6.2 (17 Jul 2004)
diff --git a/dev-java/ant-optional/Manifest b/dev-java/ant-optional/Manifest
index 2a077803a293..3a1b0ff27f2d 100644
--- a/dev-java/ant-optional/Manifest
+++ b/dev-java/ant-optional/Manifest
@@ -1,6 +1,6 @@
MD5 18cf25cf521f2fce405ff54ba713b6af ant-optional-1.6.0-r2.ebuild 4827
MD5 f42b995fefed019cb3474c9cc66100b2 ant-optional-1.6.1-r1.ebuild 4675
-MD5 dcda9132ec66458285eefefdf83edc78 ant-optional-1.6.2.ebuild 1902
+MD5 15d912faa1692b7d113c12818dfcd7bb ant-optional-1.6.2.ebuild 1967
MD5 9a43937da4c7e9089d8ecfa1bd224af9 ant-optional-1.6.0-r3.ebuild 4610
MD5 d4583291297ac4e244f8364c2c393f70 ant-optional-1.6.1.ebuild 4605
MD5 2594caee44a5ae41f3fb4056cfd3520c ChangeLog 2628
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 41496f64315d..565d2878500f 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.1 2004/07/17 09:57:51 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-optional/ant-optional-1.6.2.ebuild,v 1.2 2004/07/17 14:53:22 axxo Exp $
inherit java-pkg eutils
@@ -44,7 +44,10 @@ src_compile() {
export THREADS_FLAG="green"
fi
- libs=$(java-config -p ant,antlr,bcel,bsh,commons-beanutils,commons-net,commons-logging,sun-javamail-bin,sun-jaf-bin,jdepend,jsch,junit,jython,log4j,oro,regexp,rhino,xalan,xerces-2)
+ 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"
}