Version bump wrt bug #426294

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 77C501ED)

4 files changed, 116 insertions, 2 deletions

diff --git a/net-nds/jxplorer/ChangeLog b/net-nds/jxplorer/ChangeLog
index ca6de024bbe6..beebca96b622 100644
--- a/net-nds/jxplorer/ChangeLog
+++ b/net-nds/jxplorer/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-nds/jxplorer
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/jxplorer/ChangeLog,v 1.36 2012/08/23 14:40:07 xmw Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/jxplorer/ChangeLog,v 1.37 2014/07/29 16:36:27 ercpe Exp $
+
+*jxplorer-3.3.1 (29 Jul 2014)
+
+  29 Jul 2014; Johann Schmitz <ercpe@gentoo.org>
+  +files/3.3-disable-jxworkbench.patch, +files/jxplorer-3-pre,
+  +jxplorer-3.3.1.ebuild:
+  Version bump wrt bug #426294
 
   23 Aug 2012; Michael Weber <xmw@gentoo.org> jxplorer-3.2-r2.ebuild:
   ppc stable (bug 419325).
diff --git a/net-nds/jxplorer/files/3.3-disable-jxworkbench.patch b/net-nds/jxplorer/files/3.3-disable-jxworkbench.patch
new file mode 100644
index 000000000000..302b37c0061f
--- /dev/null
+++ b/net-nds/jxplorer/files/3.3-disable-jxworkbench.patch
@@ -0,0 +1,12 @@
+diff -Nru /tmp/jxplorer.orig/src/com/ca/directory/jxplorer/JXplorer.java src/com/ca/directory/jxplorer/JXplorer.java
+--- /tmp/jxplorer.orig/src/com/ca/directory/jxplorer/JXplorer.java	2012-07-31 14:53:59.869914047 +0300
++++ src/com/ca/directory/jxplorer/JXplorer.java	2012-07-31 14:54:47.836311029 +0300
+@@ -502,7 +502,7 @@
+ 
+         // look for JXWorkBenchBrowser 'add on' module...
+ 
+-        boolean usingJXW = true;
++        boolean usingJXW = false;
+         if (usingJXW)
+         {
+             try
diff --git a/net-nds/jxplorer/files/jxplorer-3-pre b/net-nds/jxplorer/files/jxplorer-3-pre
new file mode 100644
index 000000000000..5fe640c7328a
--- /dev/null
+++ b/net-nds/jxplorer/files/jxplorer-3-pre
@@ -0,0 +1,26 @@
+jxplorer_home=@GENTOO_PORTAGE_EPREFIX@/usr/share/jxplorer/
+
+home="${HOME}/.jxplorer"
+
+if [ ! -d "${home}" ]; then
+	mkdir -v "${home}"
+fi
+
+try_create() {
+	[[ ! -f "${1}" ]] && touch "${1}"
+}
+
+if [ -d ${HOME}/.jxplorer ]; then
+	for file in search_filters.txt bookmarks.txt quicksearch.txt ; do 
+		try_create "${home}/${file}"
+	done
+	for file in security.default csvconfig.txt.default ; do 
+		[[ ! -e "${home}/${file}" ]] && \
+			ln -vs "${jxplorer_home}/${file}" "${home}/${subdir}"
+	done
+	for subdir in htmldocs icons images templates plugins language ; do
+		[[ ! -e "${home}/${subdir}" ]] && \
+			ln -vs "${jxplorer_home}/${subdir}" "${home}/${subdir}"
+	done
+fi
+
diff --git a/net-nds/jxplorer/jxplorer-3.3.1.ebuild b/net-nds/jxplorer/jxplorer-3.3.1.ebuild
new file mode 100644
index 000000000000..11d0e33f4e8d
--- /dev/null
+++ b/net-nds/jxplorer/jxplorer-3.3.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/jxplorer/jxplorer-3.3.1.ebuild,v 1.1 2014/07/29 16:36:27 ercpe Exp $
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 prefix virtualx
+
+DESCRIPTION="A fully functional ldap browser written in java."
+HOMEPAGE="http://jxplorer.org/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-${PV}-project.zip"
+LICENSE="CAOSL"
+
+IUSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND=">=virtual/jre-1.5
+	>=dev-java/javahelp-2.0.02_p46:0"
+DEPEND=">=virtual/jdk-1.5
+	test? ( dev-java/junit:0 )
+	${RDEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="javahelp"
+EANT_TEST_ANT_TASKS="ant-junit"
+
+src_prepare() {
+	rm -v jars/*.jar || die
+	sed -i -e 's/<fileset dir="${jasper}.*//g' "${S}/build.xml" || die
+
+	epatch "${FILESDIR}"/3.3-disable-jxworkbench.patch
+
+	if use test ; then
+		EANT_GENTOO_CLASSPATH_EXTRA=$(java-pkg_getjars --build-only junit)
+	else
+		find . -iname '*Test*.java' -delete || die
+	fi
+}
+
+src_test(){
+	VIRTUALX_COMMAND="java-pkg-2_src_test" virtualmake
+}
+
+src_install() {
+	java-pkg_dojar jars/${PN}.jar
+
+	insinto /usr/share/${PN}
+	doins -r icons images htmldocs language templates plugins security.default csvconfig.txt.default
+
+	dodoc README*.TXT || die
+
+	# By default the config dir is ${HOME}/jxplorer
+	java-pkg_dolauncher ${PN} \
+		--main com.ca.directory.jxplorer.JXplorer \
+		--pwd '"${HOME}/.jxplorer"' \
+		-pre "${FILESDIR}/${PN}-3-pre"
+
+	eprefixify "${ED}/usr/bin/${PN}"
+
+	use source && java-pkg_dosrc src/com
+	use doc && java-pkg_dojavadoc docs/api
+
+	make_desktop_entry ${PN} JXplorer /usr/share/jxplorer/images/logo_32_trans.gif System
+}