From 75d53c837ea0b3c1377f056468962ef831254ed9 Mon Sep 17 00:00:00 2001 From: Petteri Räty Date: Fri, 30 Mar 2007 13:41:36 +0000 Subject: The ebuild was still calling java-pkg_jar-from for javahelp-bin but depending on from source javahelp. Revision bump to get the package.env right. Fixes bug #172783. (Portage version: 2.1.2.2) --- net-nds/jxplorer/ChangeLog | 10 +++- net-nds/jxplorer/files/digest-jxplorer-3.1-r4 | 6 --- net-nds/jxplorer/files/digest-jxplorer-3.1-r5 | 6 +++ net-nds/jxplorer/jxplorer-3.1-r4.ebuild | 66 --------------------------- net-nds/jxplorer/jxplorer-3.1-r5.ebuild | 66 +++++++++++++++++++++++++++ 5 files changed, 81 insertions(+), 73 deletions(-) delete mode 100644 net-nds/jxplorer/files/digest-jxplorer-3.1-r4 create mode 100644 net-nds/jxplorer/files/digest-jxplorer-3.1-r5 delete mode 100644 net-nds/jxplorer/jxplorer-3.1-r4.ebuild create mode 100644 net-nds/jxplorer/jxplorer-3.1-r5.ebuild (limited to 'net-nds') diff --git a/net-nds/jxplorer/ChangeLog b/net-nds/jxplorer/ChangeLog index 39bdd448917b..82f9dacdc867 100644 --- a/net-nds/jxplorer/ChangeLog +++ b/net-nds/jxplorer/ChangeLog @@ -1,6 +1,14 @@ # 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.15 2007/03/19 07:13:49 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nds/jxplorer/ChangeLog,v 1.16 2007/03/30 13:41:36 betelgeuse Exp $ + +*jxplorer-3.1-r5 (30 Mar 2007) + + 30 Mar 2007; Petteri Räty + -jxplorer-3.1-r4.ebuild, +jxplorer-3.1-r5.ebuild: + The ebuild was still calling java-pkg_jar-from for javahelp-bin but + depending on from source javahelp. Revision bump to get the package.env + right. Fixes bug #172783. 19 Mar 2007; Christian Faulhammer jxplorer-3.1-r3.ebuild: diff --git a/net-nds/jxplorer/files/digest-jxplorer-3.1-r4 b/net-nds/jxplorer/files/digest-jxplorer-3.1-r4 deleted file mode 100644 index 4af5ad6a79f7..000000000000 --- a/net-nds/jxplorer/files/digest-jxplorer-3.1-r4 +++ /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/digest-jxplorer-3.1-r5 b/net-nds/jxplorer/files/digest-jxplorer-3.1-r5 new file mode 100644 index 000000000000..4af5ad6a79f7 --- /dev/null +++ b/net-nds/jxplorer/files/digest-jxplorer-3.1-r5 @@ -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/jxplorer-3.1-r4.ebuild b/net-nds/jxplorer/jxplorer-3.1-r4.ebuild deleted file mode 100644 index 47c8e84ae88e..000000000000 --- a/net-nds/jxplorer/jxplorer-3.1-r4.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-r4.ebuild,v 1.1 2007/03/18 20:28:18 betelgeuse 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 ~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-bin - 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.1-r5.ebuild b/net-nds/jxplorer/jxplorer-3.1-r5.ebuild new file mode 100644 index 000000000000..2ee294583c05 --- /dev/null +++ b/net-nds/jxplorer/jxplorer-3.1-r5.ebuild @@ -0,0 +1,66 @@ +# 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.1 2007/03/30 13:41:36 betelgeuse 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 ~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 +} -- cgit v1.2.3-65-gdbad