Version bump. Fixes bug #258643. Thanks to Ralph Sennhauser <gentoo.sera@bluewin.ch>.

Package-Manager: portage-2.2_rc62/cvs/Linux i686

4 files changed, 143 insertions, 3 deletions

diff --git a/app-text/trang/ChangeLog b/app-text/trang/ChangeLog
index b8144abf96b0..a937e0493e2f 100644
--- a/app-text/trang/ChangeLog
+++ b/app-text/trang/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/trang
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/trang/ChangeLog,v 1.21 2007/07/02 08:25:04 ulm Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/trang/ChangeLog,v 1.22 2010/03/04 10:50:30 betelgeuse Exp $
+
+*trang-20091111 (04 Mar 2010)
+
+  04 Mar 2010; Petteri Räty <betelgeuse@gentoo.org> +trang-20091111.ebuild,
+  +files/build.xml:
+  Version bump. Fixes bug #258643. Thanks to Ralph Sennhauser
+  <gentoo.sera@bluewin.ch>.
 
   02 Jul 2007; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
   Remove emacs herd from metadata.
diff --git a/app-text/trang/Manifest b/app-text/trang/Manifest
index 10781b5f026f..78f323561524 100644
--- a/app-text/trang/Manifest
+++ b/app-text/trang/Manifest
@@ -1,5 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX build-r1.xml 2738 RMD160 17984a75f5862230f27f703ba263e9c4054d1385 SHA1 70a9001c1edee7d169efcd49bbd7e2fdd90a8be7 SHA256 8f1fbacb800d091f0118746b6e42b60868845eca4b1eb059b38ef0ceab090cb8
+AUX build.xml 2381 RMD160 a26ff6b1d4cde13b3893dc321a91a0af8c9caad6 SHA1 7f010b1af60180653da6fa0afccaa9d72f1bc373 SHA256 a6eade73b08b430cab0e239915c706f19e597d6d32348a8d29f991bb603a62aa
 DIST trang-20030619.zip 941382 RMD160 f7dea9e4aae3e753fad2faae1304d865e30a5f6e SHA1 ed1c371f11c7e3c329baab6fa2997549f03458d0 SHA256 049ede1c5524fdc2958b47fe49bcf11620e36c4c6ede08f9df530eae12243343
+DIST trang-20091111.zip 1079534 RMD160 461666fabf178576d8f4ad216734c6892b60b154 SHA1 b5f1fd4b63f347c8d0575bd1922f94316240cb29 SHA256 d8a3f034f9918ebe5b265aafeadbee6729ddda5732cfc368e2c30b3b8c0ca598
 EBUILD trang-20030619-r3.ebuild 1434 RMD160 2c68b4e2184c0b46b5814b1dc3736d0d70331ca6 SHA1 96a79c87f2d4b918bf0e59038935c51cac230e58 SHA256 cd70cb90cfbbe3965fa0bc50b9bfdc5a890503622512b77663dc4be622c1509b
-MISC ChangeLog 3203 RMD160 0dc2427730f224427b108e171379d567ebec5f07 SHA1 be0e8d333f0bcb443da284c908c37029e2773750 SHA256 f6c9fdc1034ad82084f451205c030ec0219c2bce78f5d6ba1ec3ffd2ba11cbc4
+EBUILD trang-20091111.ebuild 1236 RMD160 7b602c634ddd256642f714f5ec2cd7c8d4b49845 SHA1 aeeeb13c88079affc15d43ba2361ff4e57d79f81 SHA256 945e024bb5a09f93a3583549bb4463181929f62a27ffff392a89137486f309f3
+MISC ChangeLog 3429 RMD160 8dd06b3c3b62e4045f87b0eb3d1aecc660507d10 SHA1 e4691754779798cc0c6745ec7fda639925468cfe SHA256 b7c4fa1a9c5acee290aca780cd1d909b9ca968ad5c9f82e5cc78626325a9b61b
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkuPkD4ACgkQcxLzpIGCsLQB0QCgmwVzYqtycaUVFfJVJ3hlMeNv
+cpwAnj2nPvLJfEg6lc7T0qkQH+bOdblP
+=DCOR
+-----END PGP SIGNATURE-----
diff --git a/app-text/trang/files/build.xml b/app-text/trang/files/build.xml
new file mode 100644
index 000000000000..861a511c8bda
--- /dev/null
+++ b/app-text/trang/files/build.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Author: Ralph Sennhauser -->
+<project name="trang" default="jar" basedir=".">
+
+  <!-- properties -->
+
+  <property name="src.dir" value="src"/>
+  <property name="build.dir" value="build"/>
+  <property name="docs.dir" value="javadoc"/>
+  <property name="dist.dir" value="dist"/>
+
+  <property name="app.name" value="trang"/>
+  <property name="package.names" value="com.* org.*"/>
+  <property name="jar.name" value="${app.name}.jar"/>
+
+  <!-- targets -->
+
+  <target name="prepare">
+    <mkdir dir="${build.dir}"/>
+    <mkdir dir="${docs.dir}"/>
+    <mkdir dir="${dist.dir}"/>
+    <unzip src="${src.dir}.zip" dest="${src.dir}"/>
+	<!-- need the resource files shipped inside the jar, beed! -->
+    <unzip src="trang.jar" dest="${build.dir}">
+	  <patternset>
+	    <include name="**/*properties"/>
+	  </patternset>
+	</unzip>
+  </target>
+
+  <target name="compile" description="Compiles source" depends="prepare">
+    <javac srcdir="${src.dir}" destdir="${build.dir}" encoding="UTF-8" classpath="${classpath}">
+<!--      <compilerarg value="-Xlint:deprecation"/> -->
+<!--      <compilerarg value="-Xlint"/> -->
+    </javac>
+  </target>
+
+  <target name="javadoc" depends="prepare" description="Create javadocs">
+    <javadoc packagenames="net.*"
+			 classpath="${classpath}"
+             sourcepath="${src.dir}"
+             defaultexcludes="yes"
+             destdir="./${docs.dir}"
+             author="true"
+             version="true"
+             use="true"
+             windowtitle="${app.name} API">
+      <fileset dir="${src.dir}"/>
+    </javadoc>
+  </target>
+
+  <target name="jar" description="Create the jar" depends="compile">
+    <jar destfile="${dist.dir}/${jar.name}" basedir="${build.dir}">
+      <manifest>
+        <attribute name="Main-Class" value="com.thaiopensource.relaxng.translate.Driver"/>
+        <attribute name="Class-Path" value="."/>
+      </manifest>
+	  <service type="com.thaiopensource.datatype.xsd.regex.RegexEngine">
+	    <provider classname="com.thaiopensource.datatype.xsd.regex.java.RegexEngineImpl"/>
+	  	<provider classname="com.thaiopensource.datatype.xsd.regex.xerces2.RegexEngineImpl"/>
+	  </service>
+	  <service type="org.relaxng.datatype.DatatypeLibraryFactory">
+        <provider classname="com.thaiopensource.datatype.xsd.DatatypeLibraryFactoryImpl"/>
+	  </service>	
+    </jar>
+  </target>
+
+</project>
diff --git a/app-text/trang/trang-20091111.ebuild b/app-text/trang/trang-20091111.ebuild
new file mode 100644
index 000000000000..f384fd35f500
--- /dev/null
+++ b/app-text/trang/trang-20091111.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/trang/trang-20091111.ebuild,v 1.1 2010/03/04 10:50:30 betelgeuse Exp $
+
+EAPI="2"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Multi-format schema converter based on RELAX NG"
+HOMEPAGE="http://thaiopensource.com/relaxng/trang.html"
+SRC_URI="http://jing-trang.googlecode.com/files/${P}.zip"
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/xerces:2
+	dev-java/xml-commons-resolver:0"
+
+RDEPEND="
+	>=virtual/jre-1.5
+	${COMMON_DEP}"
+
+DEPEND="
+	app-arch/unzip
+	>=virtual/jdk-1.5
+	${COMMON_DEP}"
+
+java_prepare() {
+	# need resource files in jar archive so can't remove, see build.xml
+	# rm -v *.jar || die "Failed to remove jar archives"
+
+	cp "${FILESDIR}/build.xml" "${S}/build.xml"
+}
+
+src_compile() {
+	java-pkg-2_src_compile \
+		-Dclasspath="$(java-pkg_getjars xerces-2,xml-commons-resolver)"
+}
+
+src_install() {
+	java-pkg_dojar "dist/${PN}.jar"
+	java-pkg_dolauncher trang \
+		--main com.thaiopensource.relaxng.translate.Driver
+	dohtml *.html || die
+
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc src/{org,com}
+}