Version bump wrt bug #426294

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x77C501ED

5 files changed, 129 insertions, 7 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/Manifest b/net-nds/jxplorer/Manifest
index 104f3de06a0d..c1712ef1bbe5 100644
--- a/net-nds/jxplorer/Manifest
+++ b/net-nds/jxplorer/Manifest
@@ -2,18 +2,26 @@
 Hash: SHA256
 
 AUX 3.2-com.ca.level.patch 1158 SHA256 4716e1b03e56e899ec621035623f8f3791f2eee1252611c74892de2ac1169c35 SHA512 71443fe7d340f04f91791b53768ebda35df6ac96c603a8fb639650ad7e721dcf9b70b64278559c57a665bdabc1f9daaf60114f48e7bddf9f40e8135a7853c7e4 WHIRLPOOL 5d8129eb2a85125bab5bb4ceeb0d81c0beb13301e3e51b1ce3b3702c77c09fc024038ad5e71fb6619bff858d020212c1d81917c2dfa080334047f83d86651837
+AUX 3.3-disable-jxworkbench.patch 507 SHA256 bdceeda0d3ae4e47fd8fef6525ebc584c796798e5e02d076336ce46a50033e49 SHA512 b89c2b1831de506e437c4094ee0312a06280e5ddf88ba4882a22f9a2e2c8422a28ab7c47ebd75b52c9c303645b46b90b69a0f0d37bd17e1994683b5fa6070a0a WHIRLPOOL a939b311580e796dc8b13a52ca681540acec1e6331707ecfecf796cc85244f6d9153bf8f60d24d4beffb54a8efbff5db7c0145a4ac2ac837f79834329d67519d
 AUX build.xml 1871 SHA256 c1203b1269f3eadbea82fb54e27d75c6a6e89db71d91529ef80b9a1e67762746 SHA512 39434bad8cb85692fe65feb927ba675135e0da5401518f22ff6a17c1edfea950342bde9f7530cd48e603f41547451020aa4e0c96dbbf664548cd812ce777fa00 WHIRLPOOL 9f69f6d2ef3418d60d450cb717eb68902f164b3ca2c7559bf62f84e15cd05d21aee23111aa2bcf113546c4edf781b71c53d271ace55aa3a19ff90f52ece0eb09
+AUX jxplorer-3-pre 663 SHA256 1325841c7b09ce3c76a6a34ed1e87b6856ea6df82db77333814a23d7b036cb34 SHA512 11acb8c28a063825678ec3fe7bafc1cd1d0f99c96d49e62500d06b0584967017efb050c561826ce8b6db8a73da66ea1742f4a361fddc4e17abddad5174106f9f WHIRLPOOL c83f20d79c452f454b768d30cff0771b6e9619627f25ef9df98442985c01d93621ca57f34030f4c8c0a1c294d82bc3d28c92e934497922174d32e7b22a422d35
 AUX jxplorer-pre-r1 709 SHA256 2e1b35c60eb591aa68aea07d16ec48d8266be4c1027156aed7730293c35b32bd SHA512 c592c1389b0639c3b03b83cf155d8b7087d606bf4ea3c0062a6724b6117c25cff460e2fc203cc16b76fa295f80c7453888425fdc7cff044b272d5bc9287c21c1 WHIRLPOOL f5b6c016cdabe144b21b100a4b13428cdeea23fa7d154961aec98fc7d669bc4b9b8ed3dd556e09a25a9ccfeb4c0dc8f874adcc525d1e8b33e4c586afbb6e0475
 DIST JXv3.2deploy.tar.bz2 1771812 SHA256 0e678aa5daa829517bf080c33137db7c6ed12dd5c49a3722d12717b57fe35535 SHA512 6bca884a731572c1d627ecb87a941d2f78d82f16d14e2d9694a4e4b5d165066a1a4ee86ceab192dd050ccb76a052cc3e31463131a6124669a98949c92b0c2643 WHIRLPOOL 4ceb991b27875d7919a9394165aba2af426be13ef116475d12e4bfb73278b59796c23f03f7685bf87ea3ce7d82bcde3629575c96f9e7fe9b10cbe8dcd365f48c
 DIST JXv3.2src.tar.bz2 459951 SHA256 63789857f19eb677f488e9a031c6bebb28726d2bb967893ab6df32dfb8862cc9 SHA512 ea879330a4efb3ccb2249311e58b1c50ff510e91ee26501ef9305b88bf096ca1b7d26f91b00a660dac97741c55134c1b36f964d73c74ac1417832b9286c1ba7c WHIRLPOOL 3696ca35a0d34690e73e5590235a3fe6e29d471b2ac0f9f8ec610dc9760f62e3fff2db48349266f0746ace7de98ed08f1d90bd9b10bd415109e356bad37ca5fb
+DIST jxplorer-3.3.1-project.zip 4500476 SHA256 6e2ac77722a6a03c285a96561f6557fdfb3cd21da764166d7d7aab56560be6aa SHA512 a40bfd8a4c868a1ced1e31d45298916b4371ae781521755d784e4c027781d298f066af5390918b42024022cff5d3f0ab6a79bc6b15a1ff0adcfc1e8b79a67ca9 WHIRLPOOL b55c544daad8ab58075fe0e4ec5eb32d971056e58e1b9492c13e49cee98054cc71da098c2113cd9b431a350602419e2afc58bbe0f3a9860d301e7d6c1889384b
 EBUILD jxplorer-3.2-r2.ebuild 1831 SHA256 87ad4f15ffc1f4b463b6ed8ae20cd479b3ec19e218976fa40b0ef9bd382f8755 SHA512 15335185b9a03dbe517e1c35f2587c1aa66e77ae2e952c6ce8735248dee9260bd375e4f4eae9f2a7b06380c479590a30c9c7fb16cbd56f396a264bcf800fb702 WHIRLPOOL 20686596edbce050f03589df5f91f661af38c9c0b3b48a7e51eab837f7ecb623a3117126b7b542392a19e09aea2ed91846f88388a76c758fa682f2c702d6679f
 EBUILD jxplorer-3.2.ebuild 1593 SHA256 c93fc049c44f8c37d11fda331296aaa3285b595db7d5af05feb10ffd2e2966e9 SHA512 e4f87f5a34b3a56b50131e56dae2535171fa69522e425cf9df75d0965f3a046ce237ea79dd73e1e49c59b7ff4dbf90c1fded9bbd37463667bf2baa8804c64eac WHIRLPOOL 7f0330e533dcb7f7e92f0135b1ff7f1a02f1b72b3f3177c0006d29ec8e7a64f7bb9c13c7bf8ce5a1a745e8567b0e362fc4597d7706193d0c10745b5e561c39a4
-MISC ChangeLog 5651 SHA256 fbfe45130012dccbca182f8b03c4086670131153e746b8880d3fe2e6f613d739 SHA512 0691a213934c1b93b9c24f22d20926aaf9f7ef002af52d74924ea18d31d029bfeb76f19994191290bc14f32f8c29be5b56ac507171a5ba4f9d834b3f0ea7c58e WHIRLPOOL 897a5d728f41f894664a165e3a68bf5b191870cb292d5f6352452df0568734be3c5477f81b008466d8448b3acadcf70d253fdca839e3058ce671ea47cddb00f2
+EBUILD jxplorer-3.3.1.ebuild 1772 SHA256 526650ce60f610329ad1a3fbe0b6e498e87d414c0c4ddb752a79ed723ba94245 SHA512 702c6a1f9cbd0beede3a4056a1cf2796ca3dd01fba620ae374b0288ec09fbb3b8495a3e8230c7dc2b9388820819d1f0895b2508e1d242ed1aea04c2ad204fa0a WHIRLPOOL 87252ed8f9f98bf82025a10368cadacbaa6bbff1af38dd4067bc85c2af312a0a1300dafaf5604a97e8c9dbd6db83da17e355ca8faa71f4bd1437621ae1cdcd37
+MISC ChangeLog 5854 SHA256 2289e6053e884b0a12e50034689a5b4d873913e101d204782b3ac7172db7573f SHA512 fa8087a1ca53eb7f160d82ac619836625a4ab092bbd63bb6d6e12c8982c690ee012fcb3e05cdbe95121e23687b6e0ee3b92d64ba378761e1f35d746c7795ed09 WHIRLPOOL c0fa2ff6a2ec114943b917444fc053980734b87f151b8568a9edad7ba2c5c67fb88920ebfa8681f4189720c19333b43acb346243e569b8c5d7845bd381688761
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iF4EAREIAAYFAlA2QMwACgkQknrdDGLu8JDoAwD/ckmgCRoLo2aKqZ2fi+EoiEik
-3mJUNZffJHTEkhp/NwEA/0Qy/O8G5wAKadtjh/2QB+RmmnxeqeEx6TGtPWPgke7o
-=jkxV
+iQEcBAEBCAAGBQJT182RAAoJEKCEBkJ3xQHt/2EH/1hNLrI1DyRuptGKNfODqDcK
+DKAa4glAMNwtQwDB2ihFrGNqJNLXhxem8BhhxumfWVv3IzEXT5zrwlztHFgUH0YV
+S6cTri24Gc+0+fxSpNZ1YKg9Urx4nULvVNF/n0POBhvYpbPIgeRJ+SqArB6inNdN
+CAebUnRDQtLK96bJ9loe+79h6ep9jCxDT16EhA0d1A/GhKMpjxTw/ic+DzAheq1e
+27Sw1kr6XnnAuibTdO0Q/cVAhTIb7w4fy6VgSXLfyTqPNgALN7JLEjnF7KtkGjz6
+2tnUr2FW6Soe4hn2ZfWjzv5BAoh7D1UkDkbcwB4omtFCGHWSDpQzxkzH3/X0WW0=
+=KRlo
 -----END PGP SIGNATURE-----
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
+}