From: Petteri Räty Date: Sat, 20 Jan 2007 19:57:26 +0000 (+0000) Subject: Fixed bug #122038, made this compile with jdks >=1.5, cleaned the ebuild and added... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a18d0bb3b79fdbaf17993d646a394cc66441c1db;p=gentoo.git Fixed bug #122038, made this compile with jdks >=1.5, cleaned the ebuild and added the source use flag. Package-Manager: portage-2.1.2-r1 --- diff --git a/app-text/jing/ChangeLog b/app-text/jing/ChangeLog index 5c7562be9d52..2df3c68c8bd4 100644 --- a/app-text/jing/ChangeLog +++ b/app-text/jing/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-text/jing -# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/jing/ChangeLog,v 1.15 2006/12/03 17:28:49 nichoj Exp $ +# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/jing/ChangeLog,v 1.16 2007/01/20 19:57:26 betelgeuse Exp $ + +*jing-20030619-r3 (20 Jan 2007) + + 20 Jan 2007; Petteri Räty +files/build-r1.xml, + +jing-20030619-r3.ebuild: + Fixed bug #122038, made this compile with jdks >=1.5, cleaned the ebuild and + added the source use flag. *jing-20030619-r2 (03 Dec 2006) diff --git a/app-text/jing/Manifest b/app-text/jing/Manifest index 130d739a8104..f6cd60c569f3 100644 --- a/app-text/jing/Manifest +++ b/app-text/jing/Manifest @@ -1,7 +1,14 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX build-patch.diff 1484 RMD160 9ac2189c6912e8a3c34c11158892fd5d3a8e39ad SHA1 a822c082fe33577c6892d2c5a0f6d3dc4064058c SHA256 607242a630782389560aa387e83ba5074d28bd19c406417178abe63593934b4c MD5 4e01494f4274dfe8fbed0b4982405537 files/build-patch.diff 1484 RMD160 9ac2189c6912e8a3c34c11158892fd5d3a8e39ad files/build-patch.diff 1484 SHA256 607242a630782389560aa387e83ba5074d28bd19c406417178abe63593934b4c files/build-patch.diff 1484 +AUX build-r1.xml 729 RMD160 f8536b948ed2a455210efe49f082b6211fbe1103 SHA1 3b9d27f9de01289677cbb82f6dd3616b6d39e914 SHA256 975c3f35bbac14f17382bdee9af3ece86b4794383ab45e28c33c298ee3f71302 +MD5 4cd09a7f9afa5952e374b40d102b5cf6 files/build-r1.xml 729 +RMD160 f8536b948ed2a455210efe49f082b6211fbe1103 files/build-r1.xml 729 +SHA256 975c3f35bbac14f17382bdee9af3ece86b4794383ab45e28c33c298ee3f71302 files/build-r1.xml 729 AUX build.xml 679 RMD160 6b488e228223877b607ad96d110f879308b06572 SHA1 446f71e2f6a2b8e87bb7d8be87f00a74beebc402 SHA256 b067af1369b3aa9b3fe4bf2288c66aa2e3742f712e37a9717ad4f6c4ad1d3ce1 MD5 c5dfe0fdf4d9802d54ae83d3a3d6297b files/build.xml 679 RMD160 6b488e228223877b607ad96d110f879308b06572 files/build.xml 679 @@ -23,10 +30,14 @@ EBUILD jing-20030619-r2.ebuild 1375 RMD160 9263b109384f5dd14d259fcc66b90e4636396 MD5 0ec111af75ea00ebdd9a9aa5d3d7e8cb jing-20030619-r2.ebuild 1375 RMD160 9263b109384f5dd14d259fcc66b90e46363965f0 jing-20030619-r2.ebuild 1375 SHA256 aed2bf024a77b346c3c70796962326ca523135759206b507f4845a2da3f9cc16 jing-20030619-r2.ebuild 1375 -MISC ChangeLog 2194 RMD160 55f1de1bcfde42d59aa5578c014cec4cea0f0995 SHA1 3440efb11e66f4297ec8f550f3075ec02d39cc7f SHA256 5a1434c2fd5887c7a82ceeecd3e1527265d656bb439bf31315731a0658773849 -MD5 a319e8e2fe166fdd8635a21ecee6fd45 ChangeLog 2194 -RMD160 55f1de1bcfde42d59aa5578c014cec4cea0f0995 ChangeLog 2194 -SHA256 5a1434c2fd5887c7a82ceeecd3e1527265d656bb439bf31315731a0658773849 ChangeLog 2194 +EBUILD jing-20030619-r3.ebuild 2040 RMD160 e6255cc1c0f402dd7a0d831365c620d0c5623b43 SHA1 67c4e09aa54ae3eecaabd85456ae083223c54cc8 SHA256 a76ecbae7a23f982279c60a463299ceea5ecae423919a65a2ac3e388436bed27 +MD5 c4ea4f6f353b8f9d9c77fa9fab06dec8 jing-20030619-r3.ebuild 2040 +RMD160 e6255cc1c0f402dd7a0d831365c620d0c5623b43 jing-20030619-r3.ebuild 2040 +SHA256 a76ecbae7a23f982279c60a463299ceea5ecae423919a65a2ac3e388436bed27 jing-20030619-r3.ebuild 2040 +MISC ChangeLog 2442 RMD160 fe904fdac9c9b65c8ed57c68111c1bde617770ad SHA1 3a36809848f2edcbdabed9fcb9c7f7ad50c8bc86 SHA256 7a6be2f2180bd00808f9b67d9664dfbfdde14fb348e24ca5446a24c5c288b210 +MD5 d58c93c9f5a255e028120c58ebba0919 ChangeLog 2442 +RMD160 fe904fdac9c9b65c8ed57c68111c1bde617770ad ChangeLog 2442 +SHA256 7a6be2f2180bd00808f9b67d9664dfbfdde14fb348e24ca5446a24c5c288b210 ChangeLog 2442 MISC metadata.xml 176 RMD160 7b9811f5e25a1acb5d5bb2d9112f4b7165ecd50d SHA1 e7dded9a52a425251f7aa7127a79289fc776cbcd SHA256 54961b0f82bee2e683d1a4fdd717a964a254afad757cf4f55415b5ffd72d1424 MD5 79a5dd1b805e5bca495aec6d6a73826b metadata.xml 176 RMD160 7b9811f5e25a1acb5d5bb2d9112f4b7165ecd50d metadata.xml 176 @@ -37,3 +48,13 @@ SHA256 71febdf67b4677f7f6ebbe67355138425a2d4009f47aa3669e02a64c3b9cc935 files/di MD5 e447ff27a531845757b8d3bbc33f7a80 files/digest-jing-20030619-r2 235 RMD160 37657388b2592ac55bc00cbfc899d40d53a08d9e files/digest-jing-20030619-r2 235 SHA256 71febdf67b4677f7f6ebbe67355138425a2d4009f47aa3669e02a64c3b9cc935 files/digest-jing-20030619-r2 235 +MD5 e447ff27a531845757b8d3bbc33f7a80 files/digest-jing-20030619-r3 235 +RMD160 37657388b2592ac55bc00cbfc899d40d53a08d9e files/digest-jing-20030619-r3 235 +SHA256 71febdf67b4677f7f6ebbe67355138425a2d4009f47aa3669e02a64c3b9cc935 files/digest-jing-20030619-r3 235 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.1 (GNU/Linux) + +iD8DBQFFsnQycxLzpIGCsLQRAqgnAJwPdfq/DhOjmz8qOBfY6Ct2kTdHVACgkL2J +TxxusgEQKH3mazNr5Fn8fao= +=dsKV +-----END PGP SIGNATURE----- diff --git a/app-text/jing/files/build-r1.xml b/app-text/jing/files/build-r1.xml new file mode 100644 index 000000000000..8de4f9ad16ae --- /dev/null +++ b/app-text/jing/files/build-r1.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app-text/jing/files/digest-jing-20030619-r3 b/app-text/jing/files/digest-jing-20030619-r3 new file mode 100644 index 000000000000..00777af6daec --- /dev/null +++ b/app-text/jing/files/digest-jing-20030619-r3 @@ -0,0 +1,3 @@ +MD5 f9b0775d8740f16ab3df82ad3707a093 jing-20030619.zip 2523368 +RMD160 53ae68b42bee829f3e6da910c5a96e9910cfa430 jing-20030619.zip 2523368 +SHA256 b10a7fbbf1f5354de59700a1665f27d68a71b07f6927c2e497dc0ba294a47efd jing-20030619.zip 2523368 diff --git a/app-text/jing/jing-20030619-r3.ebuild b/app-text/jing/jing-20030619-r3.ebuild new file mode 100644 index 000000000000..8fc1e71b64f0 --- /dev/null +++ b/app-text/jing/jing-20030619-r3.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/jing/jing-20030619-r3.ebuild,v 1.1 2007/01/20 19:57:26 betelgeuse Exp $ + +inherit eutils java-pkg-2 java-ant-2 + +DESCRIPTION="Jing: A RELAX NG validator in Java" +HOMEPAGE="http://thaiopensource.com/relaxng/jing.html" +SRC_URI="http://www.thaiopensource.com/download/${P}.zip" +LICENSE="BSD Apache-1.1" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="doc source" +COMMON_DEPEND=" + =dev-java/saxon-8* + >=dev-java/xerces-2.7 + dev-java/iso-relax + dev-java/relaxng-datatype" +RDEPEND=">=virtual/jre-1.4 + ${COMMON_DEPEND}" +DEPEND=">=virtual/jdk-1.4 + app-arch/unzip + dev-java/ant-core + source? ( app-arch/zip ) + ${COMMON_DEPEND}" + +src_unpack() { + unpack ${A} + cd "${S}" + cp ${FILESDIR}/build-r1.xml build.xml || die + + mkdir src/ + cd src/ + unpack ./../src.zip + # Has java.util.regex, xerces2 and xerces1 implementation + # We only need the first one + rm -vr com/thaiopensource/datatype/xsd/regex/{xerces,xerces2} || die + epatch ${FILESDIR}/build-patch.diff + epatch ${FILESDIR}/${P}-xerces.patch + + #remove bundled relaxng-datatype + rm -r org + + cd ../bin/ + rm -v *.jar + java-pkg_jar-from iso-relax + java-pkg_jar-from xerces-2 + java-pkg_jar-from xalan + java-pkg_jar-from saxon saxon8.jar saxon.jar + java-pkg_jar-from relaxng-datatype + java-pkg_jar-from ant-core +} + +src_compile() { + eant jar #premade javadocs +} + +src_test() { + local cp + for jar in bin/*.jar; do + cp="${cp}:${jar}" + done + # would need some test files could probably take this from the gcj version + #java -cp ${cp} com.thaiopensource.datatype.xsd.regex.test.TestDriver || die + #java -cp ${cp} com.thaiopensource.datatype.relaxng.util.TestDriver || die + #java -cp ${cp} com.thaiopensource.datatype.xsd.regex.test.CategoryTest \ + # || die +} + +src_install() { + java-pkg_dojar bin/jing.jar + java-pkg_dolauncher ${PN} --main com.thaiopensource.relaxng.util.Driver + use doc && java-pkg_dohtml -r doc/* readme.html + use source && java-pkg_dosrc src/com +}