Restrict junit dependency, version dump.

(Portage version: 2.1.4_rc14)

5 files changed, 10 insertions, 126 deletions

diff --git a/net-nds/jxplorer/ChangeLog b/net-nds/jxplorer/ChangeLog
index 293865686f93..8cd58592707f 100644
--- a/net-nds/jxplorer/ChangeLog
+++ b/net-nds/jxplorer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-nds/jxplorer
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/jxplorer/ChangeLog,v 1.27 2007/11/25 11:55:44 nixnut Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/jxplorer/ChangeLog,v 1.28 2008/01/10 23:14:59 caster Exp $
+
+  10 Jan 2008; Vlastimil Babka <caster@gentoo.org>
+  -files/jxplorer-gentoo.patch, -jxplorer-3.1-r5.ebuild,
+  jxplorer-3.2.ebuild:
+  Restrict junit dependency, version dump.
 
   25 Nov 2007; nixnut <nixnut@gentoo.org> jxplorer-3.2.ebuild:
   Stable on ppc wrt bug 199230
diff --git a/net-nds/jxplorer/files/digest-jxplorer-3.1-r5 b/net-nds/jxplorer/files/digest-jxplorer-3.1-r5
deleted file mode 100644
index 4af5ad6a79f7..000000000000
--- a/net-nds/jxplorer/files/digest-jxplorer-3.1-r5
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 4f9650c2e92f3e9eb08b891663d26b1a JXv3.1deploy.tar.bz2 3078424
-RMD160 b55974f22b496d3a5f14bacfadfbd4053ac1a9bc JXv3.1deploy.tar.bz2 3078424
-SHA256 0b1a3cf27c28bf882009931f438a1d56102b6a89802e4882d006b0ec9089be05 JXv3.1deploy.tar.bz2 3078424
-MD5 fc6984c0c4c2c1a10b57c17874b982f5 JXv3.1src.tar.bz2 418206
-RMD160 0c370cda5ed7c2f24bc09b75e978ea83e2c4de58 JXv3.1src.tar.bz2 418206
-SHA256 378244bbcc44ea85a4a567a453e530f9be62c96f6ff99f623c4bc2d47a4b6c8d JXv3.1src.tar.bz2 418206
diff --git a/net-nds/jxplorer/files/jxplorer-gentoo.patch b/net-nds/jxplorer/files/jxplorer-gentoo.patch
deleted file mode 100644
index a9f8e54f4c12..000000000000
--- a/net-nds/jxplorer/files/jxplorer-gentoo.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -uprN jxplorer.orig/src/com/ca/commons/cbutil/CBOpenConWin.java jxplorer/src/com/ca/commons/cbutil/CBOpenConWin.java
---- jxplorer.orig/src/com/ca/commons/cbutil/CBOpenConWin.java	2004-12-28 19:30:42.000000000 +0100
-+++ jxplorer/src/com/ca/commons/cbutil/CBOpenConWin.java	2005-01-02 17:24:15.765367432 +0100
-@@ -501,4 +501,4 @@ public abstract class CBOpenConWin exten
-      */

- 

-     public abstract void connect(ConnectionData connectData);

--}
-\ No newline at end of file
-+}

-diff -uprN jxplorer.orig/src/com/ca/commons/cbutil/CBUtility.java jxplorer/src/com/ca/commons/cbutil/CBUtility.java
---- jxplorer.orig/src/com/ca/commons/cbutil/CBUtility.java	2004-12-28 19:30:42.000000000 +0100
-+++ jxplorer/src/com/ca/commons/cbutil/CBUtility.java	2005-01-02 17:10:12.559554200 +0100
-@@ -1399,7 +1399,7 @@ if (debug) System.out.println("\n\n Star
-             String pathToConfigFile;

- 

-             // the potential path to a config file in the user home directory

--            String userHomeConfigDir = System.getProperty("user.home") + File.separator + "jxplorer" ;

-+            String userHomeConfigDir = System.getProperty("user.home") + File.separator + ".jxplorer" ;

-             String userHomeConfigFilePath = userHomeConfigDir + File.separator + configFileName;

- 

-             // the default config location is to the directory JXplorer is run from.

-@@ -1440,4 +1440,4 @@ if (debug) System.out.println("\n\n Star
-             // the directory JXplorer is run from.

-             return defaultConfigFilePath;

-         }

--}
-\ No newline at end of file
-+}

-diff -uprN jxplorer.orig/src/com/ca/directory/jxplorer/editor/PostalAddressEditor.java jxplorer/src/com/ca/directory/jxplorer/editor/PostalAddressEditor.java
---- jxplorer.orig/src/com/ca/directory/jxplorer/editor/PostalAddressEditor.java	2004-12-28 19:30:42.000000000 +0100
-+++ jxplorer/src/com/ca/directory/jxplorer/editor/PostalAddressEditor.java	2004-12-28 19:57:10.000000000 +0100
-@@ -240,4 +240,4 @@ public class PostalAddressEditor extends
-         setVisible(false);

-         dispose();

-     }

--}
-\ No newline at end of file
-+}

-diff -uprN jxplorer.orig/src/com/ca/directory/jxplorer/JXplorer.java jxplorer/src/com/ca/directory/jxplorer/JXplorer.java
---- jxplorer.orig/src/com/ca/directory/jxplorer/JXplorer.java	2004-12-28 19:30:42.000000000 +0100
-+++ jxplorer/src/com/ca/directory/jxplorer/JXplorer.java	2005-01-02 17:09:17.747886840 +0100
-@@ -1874,4 +1874,4 @@ public class JXplorer extends JFrame    
-     {

-         return buttonRegister;

-     }

--}
-\ No newline at end of file
-+}

diff --git a/net-nds/jxplorer/jxplorer-3.1-r5.ebuild b/net-nds/jxplorer/jxplorer-3.1-r5.ebuild
deleted file mode 100644
index a6d8ec722703..000000000000
--- a/net-nds/jxplorer/jxplorer-3.1-r5.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/jxplorer/jxplorer-3.1-r5.ebuild,v 1.5 2007/06/15 20:54:00 dertobi123 Exp $
-
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="A fully functional ldap browser written in java."
-HOMEPAGE="http://jxplorer.org/"
-SRC_URI="mirror://sourceforge/${PN}/JXv${PV}src.tar.bz2
-	mirror://sourceforge/${PN}/JXv${PV}deploy.tar.bz2"
-LICENSE="CAOSL"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-RDEPEND=">=virtual/jre-1.4
-	>=dev-java/javahelp-2.0.02_p46
-	>=dev-java/log4j-1.2.8
-	dev-java/junit"
-DEPEND=">=virtual/jdk-1.4
-	${RDEPEND}"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	cp "${FILESDIR}/build.xml" ./build.xml || die
-
-	epatch "${FILESDIR}/jxplorer-gentoo.patch"
-
-	# Contains stuff for javahelp
-	mkdir dist
-	cp jars/help.jar dist || die
-
-	rm -v jars/*.jar jars/dsml/*.jar || die
-	mkdir lib/ && cd lib/
-	java-pkg_jar-from javahelp
-	java-pkg_jar-from log4j
-	java-pkg_jar-from junit
-}
-
-EANT_DOC_TARGET="docs"
-EANT_FILTER_COMPILER="jikes"
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar dist/help.jar
-
-	dodir /usr/share/${PN}
-	for i in "icons images htmldocs language templates security connections.txt log4j.xml"
-	do
-		cp -r ${i} "${D}/usr/share/${PN}" || die
-	done
-
-	dodoc RELEASE.TXT || die
-
-	java-pkg_dolauncher ${PN} \
-		--main com.ca.directory.jxplorer.JXplorer \
-		--pwd '"${HOME}/.jxplorer"' \
-		--pkg_args console \
-		-pre "${FILESDIR}/${PN}-pre-r1"
-
-	use source && java-pkg_dosrc src/com
-	use doc && java-pkg_dojavadocs docs
-}
diff --git a/net-nds/jxplorer/jxplorer-3.2.ebuild b/net-nds/jxplorer/jxplorer-3.2.ebuild
index 0999cac71831..0d6b05b5606d 100644
--- a/net-nds/jxplorer/jxplorer-3.2.ebuild
+++ b/net-nds/jxplorer/jxplorer-3.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/jxplorer/jxplorer-3.2.ebuild,v 1.5 2007/11/25 11:55:44 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/jxplorer/jxplorer-3.2.ebuild,v 1.6 2008/01/10 23:14:59 caster Exp $
 
 JAVA_PKG_IUSE="doc source"
 
@@ -16,7 +16,7 @@ KEYWORDS="amd64 ppc x86"
 RDEPEND=">=virtual/jre-1.4
 	>=dev-java/javahelp-2.0.02_p46
 	>=dev-java/log4j-1.2.8
-	dev-java/junit"
+	=dev-java/junit-3.8*"
 DEPEND=">=virtual/jdk-1.4
 	${RDEPEND}"