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 | 13bc7543a7ccc9f90f9533ed815f36a781f01bc0 (patch) | |
| tree | 3408a96610f4a95a9723d2bac29c1d7b9a3f978b /dev-java/commons-net | |
| parent | Change dependency from mod_php to virtual/php. Bug # 76623. Removed old versi... (diff) | |
| download | historical-13bc7543a7ccc9f90f9533ed815f36a781f01bc0.tar.gz historical-13bc7543a7ccc9f90f9533ed815f36a781f01bc0.tar.bz2 historical-13bc7543a7ccc9f90f9533ed815f36a781f01bc0.zip | |
fixed a dependency problem with junit/ant-tasks. also see bug #76534.
Diffstat (limited to 'dev-java/commons-net')
| -rw-r--r-- | dev-java/commons-net/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/commons-net/Manifest | 4 | ||||
| -rw-r--r-- | dev-java/commons-net/commons-net-1.3.0.ebuild | 11 |
3 files changed, 14 insertions, 6 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/Manifest b/dev-java/commons-net/Manifest index ddbf5d630866..ff4afd3d7b9f 100644 --- a/dev-java/commons-net/Manifest +++ b/dev-java/commons-net/Manifest @@ -1,6 +1,6 @@ MD5 dc02f6aac32cdc9c309278df5f6a78e3 commons-net-1.2.2.ebuild 1270 -MD5 dee5296b3c54e1b4beed2f3271130b04 commons-net-1.3.0.ebuild 1398 -MD5 66ce530a6297e9b8fc80247ac703f46d ChangeLog 2672 +MD5 87acc81a7e18693a8dafc846efd02c87 commons-net-1.3.0.ebuild 1562 +MD5 142d7939dcdfeade179bd7a23e9853e9 ChangeLog 2825 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 MD5 e2628a3419f04cdb65cb4a3caad1c9df files/gentoo.diff 4678 MD5 cd5dd0f16006dfa0491e9fb71981d402 files/gentoo-1.2.diff 3152 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 } |