From: Joshua Nichols Date: Fri, 17 Nov 2006 19:10:30 +0000 (+0000) Subject: Fixed gnu-regexp not getting on the classpath and fixed building of javadoc, bug... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c2a77f9a55b4e099c3c2295a42cb606423dd4221;p=gentoo.git Fixed gnu-regexp not getting on the classpath and fixed building of javadoc, bug #155443. Package-Manager: portage-2.1.2_pre3-r5 --- diff --git a/app-editors/jedit/ChangeLog b/app-editors/jedit/ChangeLog index f70f2ca53e60..2b9b7d5097b1 100644 --- a/app-editors/jedit/ChangeLog +++ b/app-editors/jedit/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-editors/jedit # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/ChangeLog,v 1.67 2006/11/17 15:53:03 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/ChangeLog,v 1.68 2006/11/17 19:10:30 nichoj Exp $ + +*jedit-4.3_pre7-r1 (17 Nov 2006) + + 17 Nov 2006; Joshua Nichols +jedit-4.3_pre7-r1.ebuild: + Fixed gnu-regexp not getting on the classpath and fixed building of javadoc, + bug #155443. 17 Nov 2006; nixnut jedit-4.2-r2.ebuild: Stable on ppc wrt bug 154857 diff --git a/app-editors/jedit/Manifest b/app-editors/jedit/Manifest index b388739b47a0..a4598acb8b74 100644 --- a/app-editors/jedit/Manifest +++ b/app-editors/jedit/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX jedit-4.1-jikes-fix.patch 492 RMD160 c5f50dcac3391841f1e4696c16486bf76464cb90 SHA1 ccf510313a17323a6dc949cf429e5e561f37105e SHA256 9fa5510fde4c750bd1987b216aaa39bbe6a730bc5574179960e91aea21c53f9c MD5 c8305f25e0689d0224f1c0f565a92709 files/jedit-4.1-jikes-fix.patch 492 RMD160 c5f50dcac3391841f1e4696c16486bf76464cb90 files/jedit-4.1-jikes-fix.patch 492 @@ -23,14 +20,18 @@ EBUILD jedit-4.2.ebuild 2378 RMD160 5f51e443174ad62093174d534078e1279a7e2d38 SHA MD5 09c2478a655b70234f3d8941f20f076e jedit-4.2.ebuild 2378 RMD160 5f51e443174ad62093174d534078e1279a7e2d38 jedit-4.2.ebuild 2378 SHA256 0abfa6d5707213e3604fdce481ddeb14387679e2447e159e6003fba8c405d39e jedit-4.2.ebuild 2378 +EBUILD jedit-4.3_pre7-r1.ebuild 2413 RMD160 49890cefb877f8a67fa16b5aec73f59db46082a4 SHA1 40b37e11cb86d3ca9cda99527324fcc342c93b51 SHA256 bc7951a29cac8bcac06ee20cba5efb094319bc3976f7fd3bd53513b11e899c3e +MD5 7287c325e42a138d4bda960b374fdbe1 jedit-4.3_pre7-r1.ebuild 2413 +RMD160 49890cefb877f8a67fa16b5aec73f59db46082a4 jedit-4.3_pre7-r1.ebuild 2413 +SHA256 bc7951a29cac8bcac06ee20cba5efb094319bc3976f7fd3bd53513b11e899c3e jedit-4.3_pre7-r1.ebuild 2413 EBUILD jedit-4.3_pre7.ebuild 2361 RMD160 5c150ef959804fdea69653cfdb1d7bd89d3ab8e5 SHA1 a1f3d51e7e81a4da5a29da79c30b449bfecc8f58 SHA256 286d9d813c24d21e786528eda8009548e6f148d270fac6a070ba676af5aa667c MD5 a9f84483b06b212a6725050855fe63df jedit-4.3_pre7.ebuild 2361 RMD160 5c150ef959804fdea69653cfdb1d7bd89d3ab8e5 jedit-4.3_pre7.ebuild 2361 SHA256 286d9d813c24d21e786528eda8009548e6f148d270fac6a070ba676af5aa667c jedit-4.3_pre7.ebuild 2361 -MISC ChangeLog 9171 RMD160 1b20a6e6411188d083ddb563802b6cf64b19ec57 SHA1 f2ba4746144ce937c0da42676cfef88ca6ce7461 SHA256 5af13b8fb3481ee4fad2bfc9c6485e6d42269f602f7e6fe5aab354fe7fd555bb -MD5 1c58f3c44bf4a060ae3524e5d768f582 ChangeLog 9171 -RMD160 1b20a6e6411188d083ddb563802b6cf64b19ec57 ChangeLog 9171 -SHA256 5af13b8fb3481ee4fad2bfc9c6485e6d42269f602f7e6fe5aab354fe7fd555bb ChangeLog 9171 +MISC ChangeLog 9377 RMD160 58d33cbefbc0fce1007663e3fb44cc2a273e7e9e SHA1 5ba782996d84a5aee579b0327519cc3e4948075d SHA256 1fd6c2f4ec5fba02077ed7ef10852b863248314dc39e4a849df37ffb64faaa8e +MD5 537065a88f17fd52a975189f3040d0fe ChangeLog 9377 +RMD160 58d33cbefbc0fce1007663e3fb44cc2a273e7e9e ChangeLog 9377 +SHA256 1fd6c2f4ec5fba02077ed7ef10852b863248314dc39e4a849df37ffb64faaa8e ChangeLog 9377 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158 @@ -47,10 +48,6 @@ SHA256 2c5796e0ee266ad619dc72a404afb20c3c8e03ab9abc47aabd74fc90b9251768 files/di MD5 cd898f5a48555461338a20d94490be05 files/digest-jedit-4.3_pre7 262 RMD160 9522472e5df24cea92a86232d2d6711fa5d90513 files/digest-jedit-4.3_pre7 262 SHA256 1748b6625650a91dcf4db0373b068d987216e6e0a2be5d6da16f6bc30f53927a files/digest-jedit-4.3_pre7 262 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) - -iD8DBQFFXdzHnrYavmz4OngRAkhPAKD4QoJ10kMRaLDqUoRO3t8/+nIDtQCglbzJ -kYCuiIaWKjH1VR/ZY4gT7KA= -=MDQz ------END PGP SIGNATURE----- +MD5 cd898f5a48555461338a20d94490be05 files/digest-jedit-4.3_pre7-r1 262 +RMD160 9522472e5df24cea92a86232d2d6711fa5d90513 files/digest-jedit-4.3_pre7-r1 262 +SHA256 1748b6625650a91dcf4db0373b068d987216e6e0a2be5d6da16f6bc30f53927a files/digest-jedit-4.3_pre7-r1 262 diff --git a/app-editors/jedit/files/digest-jedit-4.3_pre7-r1 b/app-editors/jedit/files/digest-jedit-4.3_pre7-r1 new file mode 100644 index 000000000000..5bad311635e1 --- /dev/null +++ b/app-editors/jedit/files/digest-jedit-4.3_pre7-r1 @@ -0,0 +1,3 @@ +MD5 8410a1211d918e0672f12451ca05dc94 jedit4.3pre7source.tar.bz2 1394321 +RMD160 bb7d5a2417a9d147d42c4a629635c25f857704c4 jedit4.3pre7source.tar.bz2 1394321 +SHA256 327fea5467fbd3d104b8613edee0b5f90d72df6fb608c587e1df506ac0173611 jedit4.3pre7source.tar.bz2 1394321 diff --git a/app-editors/jedit/jedit-4.3_pre7-r1.ebuild b/app-editors/jedit/jedit-4.3_pre7-r1.ebuild new file mode 100644 index 000000000000..8685fa42bb9d --- /dev/null +++ b/app-editors/jedit/jedit-4.3_pre7-r1.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/jedit-4.3_pre7-r1.ebuild,v 1.1 2006/11/17 19:10:30 nichoj Exp $ + +inherit java-pkg-2 java-ant-2 eutils + +# TODO use versionator +MY_PV="${PV//_/}" + +DESCRIPTION="Programmer's editor written in Java" +HOMEPAGE="http://www.jedit.org" +SRC_URI="mirror://sourceforge/${PN}/${PN}${MY_PV}source.tar.bz2" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +SLOT="0" +IUSE="doc" + +RDEPEND=">=virtual/jre-1.5 + =dev-java/gnu-regexp-1*" +DEPEND=">=virtual/jdk-1.5 + doc? ( + =app-text/docbook-xml-dtd-4.3* + >=app-text/docbook-xsl-stylesheets-1.65.1 + dev-libs/libxslt + ) + >=dev-java/ant-1.5.4 + =dev-java/gnu-regexp-1*" + +S="${WORKDIR}/jEdit" + +JEDIT_HOME="/usr/share/${PN}" + +src_unpack() { + unpack ${A} + cd ${S} + + # we need to use our own classpath + java-ant_rewrite-classpath build.xml + + if use doc; then + local xsl=$(echo /usr/share/sgml/docbook/xsl-stylesheets-*) + xsl=${xsl// *} + + local xml=$(echo /usr/share/sgml/docbook/xml-dtd-4.3*) + xml=${xml// *} + + echo "build.directory=." > build.properties + echo "docbook.dtd.catalog=${xml}/docbook.cat" >> build.properties + echo "docbook.xsl=${xsl}" >> build.properties + fi + + # remove bundled sources + rm -r gnu/* # gnu-regexp + # still need to do: bsh, com.microstar.xml.*, org.gjt.* +} +src_compile() { + # TODO could build more docs, ie userdocs target instead of generate-javadoc + eant build $(use_doc generate-javadoc) \ + -Dgentoo.classpath=$(java-pkg_getjars gnu-regexp-1):$(java-config --tools) +} + +src_install () { + dodir ${JEDIT_HOME} + cp -R build/${PN}.jar jars doc macros modes properties startup \ + ${D}/usr/share/jedit + + java-pkg_regjar ${JEDIT_HOME}/${PN}.jar + + java-pkg_dolauncher ${PN} --pwd ${JEDIT_HOME} --main org.gjt.sp.jedit.jEdit + + use doc && java-pkg_dojavadoc build/classes/javadoc/api + + make_desktop_entry ${PN} \ + jEdit \ + ${JEDIT_HOME}/doc/${PN}.png \ + "Application;Development;" + + # keep the plugin directory + keepdir ${JEDIT_HOME}/jars +} + +pkg_postinst() { + einfo "The system directory for jEdit plugins is" + einfo "${JEDIT_HOME}/jars" +} + +pkg_postrm() { + einfo "jEdit plugins installed into /usr/share/jedit/jars" + einfo "(after installation of jEdit itself) haven't been" + einfo "removed. To get rid of jEdit completely, you may" + einfo "want to run" + einfo "" + einfo "\trm -r ${JEDIT_HOME}" +}