diff options
| author |   Jan Brinkmann <luckyduck@gentoo.org> | 2005-01-11 17:27:18 +0000 |
|---|---|---|
| committer | Jan Brinkmann <luckyduck@gentoo.org> | 2005-01-11 17:27:18 +0000 |
| commit | 166bd036f1a804c583abe645bf8eed62520f686b (patch) | |
| tree | 3fc381c7786c6ccfa7208ab51a95f26693d45404 /dev-java | |
| parent | Change dependency from mod_php to virtual/php. Bug # 76623. Removed old versi... (diff) | |
| download | gentoo-2-166bd036f1a804c583abe645bf8eed62520f686b.tar.gz gentoo-2-166bd036f1a804c583abe645bf8eed62520f686b.tar.bz2 gentoo-2-166bd036f1a804c583abe645bf8eed62520f686b.zip | |
fixed a dependency problem with junit/ant-tasks. also see bug #76534.
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/commons-net/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/commons-net/commons-net-1.3.0.ebuild | 11 |
2 files changed, 12 insertions, 4 deletions
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 <luckyduck@gentoo.org> commons-net-1.3.0.ebuild: + fixed a dependency problem with junit/ant-tasks. also see bug #76534. 09 Jan 2005; Robin H. Johnson <robbat2@gentoo.org> 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 } |