From 166bd036f1a804c583abe645bf8eed62520f686b Mon Sep 17 00:00:00 2001 From: Jan Brinkmann Date: Tue, 11 Jan 2005 17:27:18 +0000 Subject: fixed a dependency problem with junit/ant-tasks. also see bug #76534. --- dev-java/commons-net/ChangeLog | 5 ++++- dev-java/commons-net/commons-net-1.3.0.ebuild | 11 ++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) (limited to 'dev-java') diff --git a/dev-java/commons-net/ChangeLog b/dev-java/commons-net/ChangeLog index dc73603a811a..f4171c0a63c9 100644 --- a/dev-java/commons-net/ChangeLog +++ b/dev-java/commons-net/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/commons-net # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-net/ChangeLog,v 1.22 2005/01/10 03:25:17 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-net/ChangeLog,v 1.23 2005/01/11 17:27:18 luckyduck Exp $ + + 11 Jan 2005; Jan Brinkmann commons-net-1.3.0.ebuild: + fixed a dependency problem with junit/ant-tasks. also see bug #76534. 09 Jan 2005; Robin H. Johnson commons-net-1.3.0.ebuild: diff --git a/dev-java/commons-net/commons-net-1.3.0.ebuild b/dev-java/commons-net/commons-net-1.3.0.ebuild index 60ecef72d035..d17b1996e876 100644 --- a/dev-java/commons-net/commons-net-1.3.0.ebuild +++ b/dev-java/commons-net/commons-net-1.3.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-net/commons-net-1.3.0.ebuild,v 1.5 2005/01/10 03:25:17 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-net/commons-net-1.3.0.ebuild,v 1.6 2005/01/11 17:27:18 luckyduck Exp $ inherit eutils java-pkg @@ -29,8 +29,13 @@ src_unpack() { cd ${S} if ! use junit ; then - sed -i 's/depends="compile,test"/depends="compile"/' \ - build.xml || die "Failed to disable junit" + sed -i 's/depends="compile,test"/depends="compile"/' \ + build.xml || die "Failed to disable junit" + else + if ! has_version dev-java/ant-tasks; then + sed -i 's/depends="compile,test"/depends="compile"/' \ + build.xml || die "Failed to disable junit" + fi fi } -- cgit v1.2.3-65-gdbad