From 746e197724b74ef17a445531f89e5db6a85f0404 Mon Sep 17 00:00:00 2001
From: Karl Trygve Kalleberg <karltk@gentoo.org>
Date: Wed, 22 Dec 2004 20:29:44 +0000
Subject: [PATCH] Fixes #74541.

---
 dev-java/commons-net/ChangeLog                |  7 ++++++-
 dev-java/commons-net/Manifest                 |  8 ++++----
 dev-java/commons-net/commons-net-1.3.0.ebuild | 14 ++++++++++----
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/dev-java/commons-net/ChangeLog b/dev-java/commons-net/ChangeLog
index dd2aa54b9220..525ad9028445 100644
--- a/dev-java/commons-net/ChangeLog
+++ b/dev-java/commons-net/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/commons-net
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-net/ChangeLog,v 1.19 2004/12/18 09:36:16 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-net/ChangeLog,v 1.20 2004/12/22 20:29:44 karltk Exp $
+
+  22 Dec 2004; Karl Trygve Kalleberg <karltk@gentoo.org>
+  commons-net-1.3.0.ebuild:
+  Disabled unit tests by default, they can be selectively enabled using the
+  junit useflag. Partial fix for #74541.
 
   18 Dec 2004; Markus Rothe <corsair@gentoo.org> commons-net-1.3.0.ebuild:
   added ~ppc64 to KEYWORDS
diff --git a/dev-java/commons-net/Manifest b/dev-java/commons-net/Manifest
index 3c4592864428..3b3127ac19df 100644
--- a/dev-java/commons-net/Manifest
+++ b/dev-java/commons-net/Manifest
@@ -1,8 +1,8 @@
-MD5 eeabe757772791e19bd8bacd540655e3 ChangeLog 2355
 MD5 f9043058d4e6acfad0e086989423f008 commons-net-1.2.2.ebuild 1264
+MD5 690bd01fd33c8e4d3203e8742208c100 commons-net-1.3.0.ebuild 1370
+MD5 d589862abf43478d3863ace020f3f326 ChangeLog 2557
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 673ec53729e785aabe7c9e7bf1ed816c commons-net-1.3.0.ebuild 1227
-MD5 fb9978c1444923f864212fcb8914da67 files/digest-commons-net-1.2.2 73
-MD5 cd5dd0f16006dfa0491e9fb71981d402 files/gentoo-1.2.diff 3152
 MD5 e2628a3419f04cdb65cb4a3caad1c9df files/gentoo.diff 4678
+MD5 cd5dd0f16006dfa0491e9fb71981d402 files/gentoo-1.2.diff 3152
+MD5 fb9978c1444923f864212fcb8914da67 files/digest-commons-net-1.2.2 73
 MD5 36815c4f205c7a6b95614626967da49b files/digest-commons-net-1.3.0 73
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 91a78fc5aac0..3b8d0006a1a4 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-2004 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.2 2004/12/18 09:36:16 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-net/commons-net-1.3.0.ebuild,v 1.3 2004/12/22 20:29:44 karltk Exp $
 
 inherit eutils java-pkg
 
@@ -8,13 +8,13 @@ DESCRIPTION="The purpose of the library is to provide fundamental protocol acces
 HOMEPAGE="http://jakarta.apache.org/commons/net/"
 SRC_URI="mirror://apache/jakarta/commons/net/source/${P}-src.tar.gz"
 DEPEND=">=virtual/jdk-1.3
-		>=dev-java/ant-core-1.5.4
-		>=dev-java/oro-2.0.7"
+	>=dev-java/ant-core-1.5.4
+	>=dev-java/oro-2.0.7"
 RDEPEND=">=virtual/jdk-1.3"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~x86 ~sparc ~ppc ~amd64 ~ppc64"
-IUSE="jikes doc"
+IUSE="jikes doc junit"
 
 S=${WORKDIR}/${P}-src
 
@@ -25,6 +25,12 @@ src_unpack() {
 	mkdir -p target/lib
 	cd target/lib
 	java-pkg_jar-from oro
+
+	cd ${S}
+	if ! use junit ; then
+		sed -i 's/depends="compile,test"/depends="compile"/' \
+			build.xml || die "Failed to disable junit"
+	fi
 }
 
 src_compile() {
-- 
2.26.2