Revision bump to support new Java system. No longer uses bundled source from relaxng-datatype.

Package-Manager: portage-2.1.2_rc2-r3

6 files changed, 106 insertions, 15 deletions

diff --git a/app-text/jing/ChangeLog b/app-text/jing/ChangeLog
index 241b3cd6c820..5c7562be9d52 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.14 2006/01/22 05:30:44 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jing/ChangeLog,v 1.15 2006/12/03 17:28:49 nichoj Exp $
+
+*jing-20030619-r2 (03 Dec 2006)
+
+  03 Dec 2006; Joshua Nichols <nichoj@gentoo.org> files/build.xml,
+  +jing-20030619-r2.ebuild:
+  Revision bump to support new Java system. No longer uses bundled source from
+  relaxng-datatype.
 
   22 Jan 2006; Joshua Nichols <nichoj@gentoo.org>
   +files/jing-20030619-xerces.patch, jing-20030619-r1.ebuild:
diff --git a/app-text/jing/Manifest b/app-text/jing/Manifest
index e2eae3a70b8d..130d739a8104 100644
--- a/app-text/jing/Manifest
+++ b/app-text/jing/Manifest
@@ -1,18 +1,39 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 650f7673064f96e185224d6cd1b9ad1f ChangeLog 1966
+AUX build-patch.diff 1484 RMD160 9ac2189c6912e8a3c34c11158892fd5d3a8e39ad SHA1 a822c082fe33577c6892d2c5a0f6d3dc4064058c SHA256 607242a630782389560aa387e83ba5074d28bd19c406417178abe63593934b4c
 MD5 4e01494f4274dfe8fbed0b4982405537 files/build-patch.diff 1484
-MD5 9ca0559020eae581281496f04c53dd7b files/build.xml 710
-MD5 a2004d054506b2ec4e8add35ec84dc44 files/digest-jing-20030619-r1 63
+RMD160 9ac2189c6912e8a3c34c11158892fd5d3a8e39ad files/build-patch.diff 1484
+SHA256 607242a630782389560aa387e83ba5074d28bd19c406417178abe63593934b4c files/build-patch.diff 1484
+AUX build.xml 679 RMD160 6b488e228223877b607ad96d110f879308b06572 SHA1 446f71e2f6a2b8e87bb7d8be87f00a74beebc402 SHA256 b067af1369b3aa9b3fe4bf2288c66aa2e3742f712e37a9717ad4f6c4ad1d3ce1
+MD5 c5dfe0fdf4d9802d54ae83d3a3d6297b files/build.xml 679
+RMD160 6b488e228223877b607ad96d110f879308b06572 files/build.xml 679
+SHA256 b067af1369b3aa9b3fe4bf2288c66aa2e3742f712e37a9717ad4f6c4ad1d3ce1 files/build.xml 679
+AUX jing-20030619-xerces.patch 1393 RMD160 bde64c33e49f902082e3944d8069f01a741c17ba SHA1 d43d28f487a804a3b2ea2d20f45d8ce1791a7890 SHA256 d76ab9f7e0e956ab75d704ab061450a0465c03bbda7542dc275aec11f5cd3685
 MD5 16d1fac29c56d57e0eee5aecefee4fcf files/jing-20030619-xerces.patch 1393
+RMD160 bde64c33e49f902082e3944d8069f01a741c17ba files/jing-20030619-xerces.patch 1393
+SHA256 d76ab9f7e0e956ab75d704ab061450a0465c03bbda7542dc275aec11f5cd3685 files/jing-20030619-xerces.patch 1393
+AUX manifest.mf 136 RMD160 6a9c016ab15253afcb64ce98ca79f6103eb5c390 SHA1 bc17c7cddb23ea666433aebb5d1b424b6888ce33 SHA256 6b213e3b27c1da1af15ad68b477409a6e19397951970818f4360ea922ba54d87
 MD5 60267d864fc6a05822d8b732ff12e8dd files/manifest.mf 136
+RMD160 6a9c016ab15253afcb64ce98ca79f6103eb5c390 files/manifest.mf 136
+SHA256 6b213e3b27c1da1af15ad68b477409a6e19397951970818f4360ea922ba54d87 files/manifest.mf 136
+DIST jing-20030619.zip 2523368 RMD160 53ae68b42bee829f3e6da910c5a96e9910cfa430 SHA1 10c2b8c651c639389642b712497597664d95f2cb SHA256 b10a7fbbf1f5354de59700a1665f27d68a71b07f6927c2e497dc0ba294a47efd
+EBUILD jing-20030619-r1.ebuild 1471 RMD160 54efb237adc7b4873c01b2a8d3edcb82d0a5b23c SHA1 5301e2e013e0b3ce7a133c9da7d63a8c6bbbcf45 SHA256 fb7af964037ca9c0767c5f39b81df66dec6fd688e6ca54aef4dd23b8dd5ba9ab
 MD5 e1836574ad24fe4864d2d3f14b588803 jing-20030619-r1.ebuild 1471
+RMD160 54efb237adc7b4873c01b2a8d3edcb82d0a5b23c jing-20030619-r1.ebuild 1471
+SHA256 fb7af964037ca9c0767c5f39b81df66dec6fd688e6ca54aef4dd23b8dd5ba9ab jing-20030619-r1.ebuild 1471
+EBUILD jing-20030619-r2.ebuild 1375 RMD160 9263b109384f5dd14d259fcc66b90e46363965f0 SHA1 593a55c10d2436840a2c9f497d8925c145924694 SHA256 aed2bf024a77b346c3c70796962326ca523135759206b507f4845a2da3f9cc16
+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
+MISC metadata.xml 176 RMD160 7b9811f5e25a1acb5d5bb2d9112f4b7165ecd50d SHA1 e7dded9a52a425251f7aa7127a79289fc776cbcd SHA256 54961b0f82bee2e683d1a4fdd717a964a254afad757cf4f55415b5ffd72d1424
 MD5 79a5dd1b805e5bca495aec6d6a73826b metadata.xml 176
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD0xW/ndWRXhKOboURAhsWAKDTpOmxdJRrw1EnuD/qFepK/ryWCACdHhiE
-afjXxWIOwmk8CkDJaPlV0C0=
-=47Z+
------END PGP SIGNATURE-----
+RMD160 7b9811f5e25a1acb5d5bb2d9112f4b7165ecd50d metadata.xml 176
+SHA256 54961b0f82bee2e683d1a4fdd717a964a254afad757cf4f55415b5ffd72d1424 metadata.xml 176
+MD5 e447ff27a531845757b8d3bbc33f7a80 files/digest-jing-20030619-r1 235
+RMD160 37657388b2592ac55bc00cbfc899d40d53a08d9e files/digest-jing-20030619-r1 235
+SHA256 71febdf67b4677f7f6ebbe67355138425a2d4009f47aa3669e02a64c3b9cc935 files/digest-jing-20030619-r1 235
+MD5 e447ff27a531845757b8d3bbc33f7a80 files/digest-jing-20030619-r2 235
+RMD160 37657388b2592ac55bc00cbfc899d40d53a08d9e files/digest-jing-20030619-r2 235
+SHA256 71febdf67b4677f7f6ebbe67355138425a2d4009f47aa3669e02a64c3b9cc935 files/digest-jing-20030619-r2 235
diff --git a/app-text/jing/files/build.xml b/app-text/jing/files/build.xml
index 1f143474a2ad..5a444248c016 100644
--- a/app-text/jing/files/build.xml
+++ b/app-text/jing/files/build.xml
@@ -9,7 +9,7 @@
 			destdir="build"
 			source="1.4">
 			<classpath>
-				<pathelement path="bin/isorelax.jar:bin/saxon.jar:bin/xerces.jar" />
+				<fileset dir="bin" includes="*.jar"/>
 			</classpath>
 		</javac>
 		
diff --git a/app-text/jing/files/digest-jing-20030619-r1 b/app-text/jing/files/digest-jing-20030619-r1
index 0527c6689212..00777af6daec 100644
--- a/app-text/jing/files/digest-jing-20030619-r1
+++ b/app-text/jing/files/digest-jing-20030619-r1
@@ -1 +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/files/digest-jing-20030619-r2 b/app-text/jing/files/digest-jing-20030619-r2
new file mode 100644
index 000000000000..00777af6daec
--- /dev/null
+++ b/app-text/jing/files/digest-jing-20030619-r2
@@ -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-r2.ebuild b/app-text/jing/jing-20030619-r2.ebuild
new file mode 100644
index 000000000000..e34232a2c442
--- /dev/null
+++ b/app-text/jing/jing-20030619-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/jing/jing-20030619-r2.ebuild,v 1.1 2006/12/03 17:28:49 nichoj Exp $
+
+inherit java-pkg-2 eutils
+
+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"
+COMMON_DEPEND="
+	=dev-java/saxon-8*
+	=dev-java/xerces-1.3*
+	dev-java/iso-relax
+	dev-java/relaxng-datatype"
+RDEPEND=">=virtual/jre-1.3
+	${COMMON_DEPEND}"
+DEPEND=">=virtual/jdk-1.3
+	${COMMON_DEPEND}
+	app-arch/unzip"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	mkdir src/
+	unzip -qq -d src/ src.zip || die "failed to unzip"
+	cd src/
+	epatch ${FILESDIR}/build-patch.diff
+	epatch ${FILESDIR}/${P}-xerces.patch
+
+	# remove bundled relaxng-datatype
+	rm -r org
+
+	cd ../bin/
+	rm -f *.jar
+	java-pkg_jar-from iso-relax
+	java-pkg_jar-from xerces-1.3 xerces.jar
+	java-pkg_jar-from saxon saxon8.jar saxon.jar
+	java-pkg_jar-from relaxng-datatype
+
+	cd ..
+	cp ${FILESDIR}/build.xml .
+	cp ${FILESDIR}/manifest.mf .
+}
+
+src_compile() {
+	eant jar
+}
+
+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
+}