new upstream version, marked rc4 stable on amd64 and x86. did some cleanup

(Portage version: 2.0.51.21)

7 files changed, 77 insertions, 34 deletions

diff --git a/net-nds/jxplorer/ChangeLog b/net-nds/jxplorer/ChangeLog
index d292a8f64e07..7a6b108e5c70 100644
--- a/net-nds/jxplorer/ChangeLog
+++ b/net-nds/jxplorer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-nds/jxplorer
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/jxplorer/ChangeLog,v 1.5 2005/01/22 15:35:19 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/jxplorer/ChangeLog,v 1.6 2005/05/04 22:24:03 luckyduck Exp $
+
+*jxplorer-3.1 (04 May 2005)
+
+  04 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  -jxplorer-3.1_beta1.ebuild, jxplorer-3.1_rc4.ebuild, +jxplorer-3.1.ebuild:
+  new upstream version, marked rc4 stable on amd64 and x86. did some cleanup
 
 *jxplorer-3.1_rc4 (22 Jan 2005)
 
diff --git a/net-nds/jxplorer/Manifest b/net-nds/jxplorer/Manifest
index ed3a5620dc11..71da33e4b0ee 100644
--- a/net-nds/jxplorer/Manifest
+++ b/net-nds/jxplorer/Manifest
@@ -1,10 +1,10 @@
-MD5 b77125bda3e3b1fb4c377b3b7832c90a jxplorer-3.1_rc4.ebuild 1521
-MD5 9595af6aeacd7589d234fcce988b6953 jxplorer-3.1_beta1.ebuild 695
-MD5 926718f1bb278f8f53b43cee40d8a05a ChangeLog 919
+MD5 2384473f88799e5a61be20f39a2ad187 jxplorer-3.1_rc4.ebuild 1517
+MD5 8b875c0191b35aceecfc87274ffcd238 jxplorer-3.1.ebuild 1515
+MD5 83d26fc56b7046ac3fd22b9b4d49bcab ChangeLog 1155
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 02193c618856347b1d7ec23ec21e4475 files/jxplorer-log4j.patch 613
+MD5 6fe4c04ebf5a63fa526bb37c47dd6089 files/digest-jxplorer-3.1 128
 MD5 c2de8cca5efcd98939e5baf3728a3692 files/jxplorer-gentoo.patch 2578
 MD5 b04073e642024032d31552ae958c3149 files/digest-jxplorer-3.1_rc4 134
 MD5 19c309ed0cfd34dc531818b1607a2a47 files/build.xml 1871
-MD5 f2edd981dbec6678640f94950ab48032 files/digest-jxplorer-3.1_beta1 68
 MD5 c71a48763e3bab86565e7c87fd7034b1 files/jxplorer.sh 888
diff --git a/net-nds/jxplorer/files/digest-jxplorer-3.1 b/net-nds/jxplorer/files/digest-jxplorer-3.1
new file mode 100644
index 000000000000..ac3cb10ab1d4
--- /dev/null
+++ b/net-nds/jxplorer/files/digest-jxplorer-3.1
@@ -0,0 +1,2 @@
+MD5 fc6984c0c4c2c1a10b57c17874b982f5 JXv3.1src.tar.bz2 418206
+MD5 4f9650c2e92f3e9eb08b891663d26b1a JXv3.1deploy.tar.bz2 3078424
diff --git a/net-nds/jxplorer/files/digest-jxplorer-3.1_beta1 b/net-nds/jxplorer/files/digest-jxplorer-3.1_beta1
deleted file mode 100644
index 9999acfcd561..000000000000
--- a/net-nds/jxplorer/files/digest-jxplorer-3.1_beta1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 208613f96585702822f57ed200c41bf1 JXv3.1b1deploy.tar.bz2 3025052
diff --git a/net-nds/jxplorer/jxplorer-3.1.ebuild b/net-nds/jxplorer/jxplorer-3.1.ebuild
new file mode 100644
index 000000000000..c0688da16100
--- /dev/null
+++ b/net-nds/jxplorer/jxplorer-3.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/jxplorer/jxplorer-3.1.ebuild,v 1.1 2005/05/04 22:24:03 luckyduck Exp $
+
+inherit eutils java-pkg
+
+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="~x86 ~amd64"
+IUSE="doc"
+DEPEND=">=virtual/jdk-1.4"
+RDEPEND=">=virtual/jre-1.4
+	>=dev-java/commons-discovery-0.2
+	>=dev-java/commons-logging-1.0.4
+	>=dev-java/dom4j-1.4
+	>=dev-java/javahelp-bin-2.0.01
+	>=dev-java/log4j-1.2.8
+	>=dev-java/sun-dsml-bin-2.1.2_pre1
+	>=dev-java/sun-jaf-bin-1.0.2
+	>=dev-java/sun-javamail-bin-1.3.1
+	>=www-servers/axis-1.1"
+RESTRICT="nomirror"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	cp ${FILESDIR}/build.xml ./build.xml
+
+	epatch ${FILESDIR}/jxplorer-log4j.patch
+	epatch ${FILESDIR}/jxplorer-gentoo.patch
+
+	mkdir lib/ && cd lib/
+	java-pkg_jar-from javahelp-bin
+}
+
+src_compile() {
+	# jikes build not possible atm
+	local antflags="jar"
+	use doc && antflags="${antflags} docs"
+	ant ${antflags} || die "compile failed"
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar jars/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}
+	done
+
+	newbin ${FILESDIR}/jxplorer.sh jxplorer
+}
diff --git a/net-nds/jxplorer/jxplorer-3.1_beta1.ebuild b/net-nds/jxplorer/jxplorer-3.1_beta1.ebuild
deleted file mode 100644
index d1a9cac166b5..000000000000
--- a/net-nds/jxplorer/jxplorer-3.1_beta1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/jxplorer/jxplorer-3.1_beta1.ebuild,v 1.5 2005/01/22 15:35:19 luckyduck Exp $
-
-DESCRIPTION="A fully functional ldap browser written in java."
-HOMEPAGE="http://jxplorer.org/"
-SRC_URI="mirror://sourceforge/${PN}/JXv3.1b1deploy.tar.bz2"
-LICENSE="CAOSL"
-SLOT="0"
-KEYWORDS="x86 ~amd64"
-IUSE=""
-DEPEND="virtual/jre"
-RESTRICT="nomirror"
-
-S=${WORKDIR}/${PN}
-
-src_compile() { :; }
-
-src_install() {
-	dodir /opt/jxplorer
-	cp -R ${S}/* ${D}/opt/jxplorer
-	chmod 755 ${D}/opt/${PN}/${PN}.sh
-	dodir /opt/bin
-	ln -sf ${D}/opt/${PN}/${PN}.sh ${D}/opt/bin/${PN}
-}
diff --git a/net-nds/jxplorer/jxplorer-3.1_rc4.ebuild b/net-nds/jxplorer/jxplorer-3.1_rc4.ebuild
index b0b23074702a..9e134b491712 100644
--- a/net-nds/jxplorer/jxplorer-3.1_rc4.ebuild
+++ b/net-nds/jxplorer/jxplorer-3.1_rc4.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/net-nds/jxplorer/jxplorer-3.1_rc4.ebuild,v 1.1 2005/01/22 15:35:20 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/jxplorer/jxplorer-3.1_rc4.ebuild,v 1.2 2005/05/04 22:24:03 luckyduck Exp $
 
 inherit eutils java-pkg
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/JXv${PV/_/}src.tar.bz2
 	mirror://sourceforge/${PN}/JXv${PV/_/}deploy.tar.bz2"
 LICENSE="CAOSL"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64"
 IUSE="doc"
 DEPEND=">=virtual/jdk-1.4"
 RDEPEND=">=virtual/jre-1.4
@@ -22,7 +22,7 @@ RDEPEND=">=virtual/jre-1.4
 	>=dev-java/sun-dsml-bin-2.1.2_pre1
 	>=dev-java/sun-jaf-bin-1.0.2
 	>=dev-java/sun-javamail-bin-1.3.1
-	>=www-servers/axis-1.1"
+	=www-servers/axis-1*"
 RESTRICT="nomirror"
 
 S=${WORKDIR}/${PN}