Fix icons not showing for new installs (bug #169117).

(Portage version: 2.1.2.2)

6 files changed, 110 insertions, 4 deletions

diff --git a/net-nds/jxplorer/ChangeLog b/net-nds/jxplorer/ChangeLog
index e73925ae2cd7..d57c8ee78ce0 100644
--- a/net-nds/jxplorer/ChangeLog
+++ b/net-nds/jxplorer/ChangeLog
@@ -1,6 +1,13 @@
 # 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.13 2007/03/17 17:54:33 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/jxplorer/ChangeLog,v 1.14 2007/03/18 20:28:18 betelgeuse Exp $
+
+*jxplorer-3.1-r4 (18 Mar 2007)
+*jxplorer-3.1-r3 (18 Mar 2007)
+
+  18 Mar 2007; Petteri Räty <betelgeuse@gentoo.org> +files/jxplorer-pre-r1,
+  -jxplorer-3.1-r2.ebuild, +jxplorer-3.1-r3.ebuild, +jxplorer-3.1-r4.ebuild:
+  Fix icons not showing for new installs (bug #169117).
 
   17 Mar 2007; William L. Thomson Jr. <wltjr@gentoo.org>
   jxplorer-3.1-r2.ebuild:
diff --git a/net-nds/jxplorer/files/digest-jxplorer-3.1-r2 b/net-nds/jxplorer/files/digest-jxplorer-3.1-r3
index 4af5ad6a79f7..4af5ad6a79f7 100644
--- a/net-nds/jxplorer/files/digest-jxplorer-3.1-r2
+++ b/net-nds/jxplorer/files/digest-jxplorer-3.1-r3
diff --git a/net-nds/jxplorer/files/digest-jxplorer-3.1-r4 b/net-nds/jxplorer/files/digest-jxplorer-3.1-r4
new file mode 100644
index 000000000000..4af5ad6a79f7
--- /dev/null
+++ b/net-nds/jxplorer/files/digest-jxplorer-3.1-r4
@@ -0,0 +1,6 @@
+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-pre-r1 b/net-nds/jxplorer/files/jxplorer-pre-r1
new file mode 100644
index 000000000000..721393675ee5
--- /dev/null
+++ b/net-nds/jxplorer/files/jxplorer-pre-r1
@@ -0,0 +1,25 @@
+jxplorer_home=/usr/share/jxplorer/
+
+home="${HOME}/.jxplorer"
+
+if [ ! -d "${home}" ]; then
+	mkdir -v "${home}"
+	cp -v ${jxplorer_home}/connections.txt "${home}"
+fi
+
+try_create() {
+	[[ ! -f "${1}" ]] && touch "${1}"
+}
+
+if [ -d ${HOME}/.jxplorer ]; then
+	try_create "${home}/dxconfig.txt"
+	try_create "${home}/jxplorer.log"
+	if [ ! -f ${HOME}/.jxplorer/connections.txt ]; then
+		cp -v ${jxplorer_home}/connections.txt ${HOME}/.jxplorer
+	fi
+	for subdir in htmldocs icons images templates; do
+		[[ ! -e "${home}/${subdir}" ]] && \
+			ln -vs "${jxplorer_home}/${subdir}" "${home}/${subdir}"
+	done
+fi
+
diff --git a/net-nds/jxplorer/jxplorer-3.1-r3.ebuild b/net-nds/jxplorer/jxplorer-3.1-r3.ebuild
new file mode 100644
index 000000000000..6e05dd4ac3ab
--- /dev/null
+++ b/net-nds/jxplorer/jxplorer-3.1-r3.ebuild
@@ -0,0 +1,68 @@
+# 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-r3.ebuild,v 1.1 2007/03/18 20:28:18 betelgeuse Exp $
+
+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 ~x86"
+IUSE="doc source"
+RDEPEND=">=virtual/jre-1.4
+	>=dev-java/javahelp-bin-2.0.01
+	>=dev-java/log4j-1.2.8
+	dev-java/junit"
+DEPEND=">=virtual/jdk-1.4
+	dev-java/ant-core
+	source? ( app-arch/zip )
+	${RDEPEND}"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	cp ${FILESDIR}/build.xml ./build.xml
+
+	epatch ${FILESDIR}/jxplorer-gentoo.patch
+
+	# Contains stuff for javahelp
+	mkdir dist
+	cp jars/help.jar dist || die
+
+	rm -v jars/*.jar jars/dsml/*.jar
+	mkdir lib/ && cd lib/
+	java-pkg_jar-from javahelp-bin
+	java-pkg_jar-from log4j
+	java-pkg_jar-from junit
+}
+
+#TODO: filter jikes when the general src_compile can do it
+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}
+	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.1-r2.ebuild b/net-nds/jxplorer/jxplorer-3.1-r4.ebuild
index f4c6b226f477..47c8e84ae88e 100644
--- a/net-nds/jxplorer/jxplorer-3.1-r2.ebuild
+++ b/net-nds/jxplorer/jxplorer-3.1-r4.ebuild
@@ -1,6 +1,6 @@
 # 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-r2.ebuild,v 1.2 2007/03/17 17:54:33 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/jxplorer/jxplorer-3.1-r4.ebuild,v 1.1 2007/03/18 20:28:18 betelgeuse Exp $
 
 JAVA_PKG_IUSE="doc source"
 
@@ -57,9 +57,9 @@ src_install() {
 
 	java-pkg_dolauncher ${PN} \
 		--main com.ca.directory.jxplorer.JXplorer \
-		--pwd '${HOME}/.jxplorer/' \
+		--pwd '"${HOME}/.jxplorer"' \
 		--pkg_args console \
-		-pre "${FILESDIR}/${PN}-pre"
+		-pre "${FILESDIR}/${PN}-pre-r1"
 
 	use source && java-pkg_dosrc src/com
 	use doc && java-pkg_dojavadocs docs