Added doc and source use flags and fixed compile to properly use both 1.3 and 2 slots...

Package-Manager: portage-2.1.2_rc2-r1

diff --git a/app-text/trang/ChangeLog b/app-text/trang/ChangeLog
index b5e9264f0b35f7710d42ca323728d66de6583572..667a57613707d28f23e396ee39c5773460928a69 100644 (file)
--- a/app-text/trang/ChangeLog
+++ b/app-text/trang/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/trang
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/trang/ChangeLog,v 1.13 2006/11/24 18:56:29 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/trang/ChangeLog,v 1.14 2006/11/25 18:52:55 betelgeuse Exp $
+
+*trang-20030619-r3 (25 Nov 2006)
+
+  25 Nov 2006; Petteri Räty <betelgeuse@gentoo.org> +files/build-r1.xml,
+  +trang-20030619-r3.ebuild:
+  Added doc and source use flags and fixed compile to properly use both 1.3
+  and 2 slots of xerces.
 
 *trang-20030619-r2 (24 Nov 2006)
 

diff --git a/app-text/trang/Manifest b/app-text/trang/Manifest
index d57cf318bb3e1538f10ae4593a230f56571abb88..cade5a1c679c7b20d1a243225e6b39e862fa01d0 100644 (file)
--- a/app-text/trang/Manifest
+++ b/app-text/trang/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX build-r1.xml 2738 RMD160 17984a75f5862230f27f703ba263e9c4054d1385 SHA1 70a9001c1edee7d169efcd49bbd7e2fdd90a8be7 SHA256 8f1fbacb800d091f0118746b6e42b60868845eca4b1eb059b38ef0ceab090cb8
+MD5 78b764efefb6f915dfa315945234516d files/build-r1.xml 2738
+RMD160 17984a75f5862230f27f703ba263e9c4054d1385 files/build-r1.xml 2738
+SHA256 8f1fbacb800d091f0118746b6e42b60868845eca4b1eb059b38ef0ceab090cb8 files/build-r1.xml 2738
 AUX build.xml 669 RMD160 2d209cc9cf0b1e280a96e76d4fa4a4a3e3085077 SHA1 f3b90555788e59c62a99fd468ac737fe43e3676f SHA256 618c79a8178de6713c50d289471550db4bd2500fba66de5090ad10763eaeaaf9
 MD5 4067ed3d01d556519f8f66f469e56374 files/build.xml 669
 RMD160 2d209cc9cf0b1e280a96e76d4fa4a4a3e3085077 files/build.xml 669
@@ -14,10 +18,14 @@ EBUILD trang-20030619-r2.ebuild 1032 RMD160 5f033b470bb2a99444e2f2e3e803bc94b7e6
 MD5 ea74d6ebf1e9a7be630d9939d6c59ffd trang-20030619-r2.ebuild 1032
 RMD160 5f033b470bb2a99444e2f2e3e803bc94b7e61836 trang-20030619-r2.ebuild 1032
 SHA256 fe341f44fcbd4420cc1f5bbd4f1ae935dcc636271cdc63264dfe85afd55ab449 trang-20030619-r2.ebuild 1032
-MISC ChangeLog 2073 RMD160 8277f7d54f086ae951ad9e855c5f206848e454ac SHA1 5c9e44c9793f9dc36f94eb5aac54f22296c790eb SHA256 91f5ebfa93fb42f2db42740139af66bb1e437e78d008e2b9e278f97e81424608
-MD5 5ced48fdb17cdf7f88aa3b1108ac4cd4 ChangeLog 2073
-RMD160 8277f7d54f086ae951ad9e855c5f206848e454ac ChangeLog 2073
-SHA256 91f5ebfa93fb42f2db42740139af66bb1e437e78d008e2b9e278f97e81424608 ChangeLog 2073
+EBUILD trang-20030619-r3.ebuild 1431 RMD160 d1bf49c076ca328060a8b1423190ce043e8cffb4 SHA1 bacd97347a1b891eb4616534bd1f1d9801f750a5 SHA256 a44ca238dc7fa4fc7d6bb8e928006d1350445e237b355070cfd81dd95e76ff4f
+MD5 0d8c51b8584d9aefce6bfb7c824bcb7d trang-20030619-r3.ebuild 1431
+RMD160 d1bf49c076ca328060a8b1423190ce043e8cffb4 trang-20030619-r3.ebuild 1431
+SHA256 a44ca238dc7fa4fc7d6bb8e928006d1350445e237b355070cfd81dd95e76ff4f trang-20030619-r3.ebuild 1431
+MISC ChangeLog 2317 RMD160 8e791e805a2cb36f17d97ae14a3dcc5b81da6ba0 SHA1 0c13649b7cd54f9cbc83a55bbf1b1244125fc588 SHA256 66d25c09d19f6d319102afb19bdca679f1b0d6a714b7ba701ff28ee40ed5fd45
+MD5 3a11ed023459e1ec06f9257d7d9b8d89 ChangeLog 2317
+RMD160 8e791e805a2cb36f17d97ae14a3dcc5b81da6ba0 ChangeLog 2317
+SHA256 66d25c09d19f6d319102afb19bdca679f1b0d6a714b7ba701ff28ee40ed5fd45 ChangeLog 2317
 MISC metadata.xml 176 RMD160 7b9811f5e25a1acb5d5bb2d9112f4b7165ecd50d SHA1 e7dded9a52a425251f7aa7127a79289fc776cbcd SHA256 54961b0f82bee2e683d1a4fdd717a964a254afad757cf4f55415b5ffd72d1424
 MD5 79a5dd1b805e5bca495aec6d6a73826b metadata.xml 176
 RMD160 7b9811f5e25a1acb5d5bb2d9112f4b7165ecd50d metadata.xml 176
@@ -28,10 +36,13 @@ SHA256 49fa5bd04111bce566eb43802219fb046f3a5a6aff99b2dc12978b0f9e567af1 files/di
 MD5 58ed1e8e5816bfaf5eee7abb48a9b49e files/digest-trang-20030619-r2 235
 RMD160 c9bdda85f07ed48251b14468f01d5f73c6a4f234 files/digest-trang-20030619-r2 235
 SHA256 49fa5bd04111bce566eb43802219fb046f3a5a6aff99b2dc12978b0f9e567af1 files/digest-trang-20030619-r2 235
+MD5 58ed1e8e5816bfaf5eee7abb48a9b49e files/digest-trang-20030619-r3 235
+RMD160 c9bdda85f07ed48251b14468f01d5f73c6a4f234 files/digest-trang-20030619-r3 235
+SHA256 49fa5bd04111bce566eb43802219fb046f3a5a6aff99b2dc12978b0f9e567af1 files/digest-trang-20030619-r3 235
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFZ0BuNQqtfCuFneMRAlZgAKCX/J4gTeDvJIqGAO79HoA1wmBX4QCdG3nn
-7WX4DaywZeyADuZgs7XiWGA=
-=aVKX
+iD8DBQFFaJEdcxLzpIGCsLQRAsn7AJ44YjgTTLQkGZGQzZ4Puzy+pqoROACfUpqh
+eljVaE5A+gzuGPsrtC6+dwk=
+=pGYy
 -----END PGP SIGNATURE-----

diff --git a/app-text/trang/files/build-r1.xml b/app-text/trang/files/build-r1.xml
new file mode 100644 (file)
index 0000000..dcb2f07
--- /dev/null
+++ b/app-text/trang/files/build-r1.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!---
+   @author: Saleem Abdulrasool <compnerd@gentoo.org>
+   @date: 5/9/2005
+   @modified: 10/23/2005
+   @revision: 1.0_alpha
+
+   @notes:
+      Call using the following:
+      ant -f build.xml -Dproject.name=${project name} -Dpackage.name=${package name}
+
+      It will create a jar called ${project.name} and will try to generate javadoc
+      for the comma delimited list ${package.name} (fex org.gentoo.*,org.compnerd.*)
+
+      Define classpath.broken (-Dclasspath.broken=1) if you need a top level Manifest.
+
+      All paths can be overridden by defining the values in build.properties in the
+      same directory as this build file.
+-->
+
+<project name="Gentoo_Builder" default="jar" basedir=".">
+   <property name="src" value="src"/>
+   <property name="build" value="build"/>
+   <property name="dist" value="dist"/>
+   <property name="lib" value="lib"/>
+
+   <property name="pkg" value="${package.name}"/>
+   <property name="jar" value="${project.name}.jar"/>
+
+   <!-- Override any defined properties -->
+   <property file="build.properties"/>
+
+   <available file="${lib}" type="dir" property="libdir.exists"/>
+
+   <target name="init">
+      <tstamp/>
+      <mkdir dir="${build}"/>
+      <mkdir dir="${dist}"/>
+      <mkdir dir="${dist}/doc"/>
+
+      <!-- Check if we need to modify the classpath -->
+      <antcall target="if-libdir"/>
+   </target>
+
+   <!-- If the directory exists, append to classpath -->
+   <target name="if-libdir" if="libdir.exists">
+      <property name="classpath" value="${classpath}:${lib}"/>
+      <classpath>
+         <pathelement path="${classpath}"/>
+         <fileset dir="${lib}">
+            <include name="**/*.jar"/>
+         </fileset>
+      </classpath>
+   </target>
+
+   <target name="compile" depends="init">
+      <javac srcdir="${src}" destdir="${build}" classpath="${classpath}"/>
+   </target>
+
+   <target name="manifest" depends="init">
+      <manifest file="${build}/MANIFEST.MF" mode="update">
+         <attribute name="Built-By" value="Gentoo Portage"/>
+      </manifest>
+   </target>
+   
+   <target name="jar" depends="compile,manifest">
+      <jar destfile="${dist}/${jar}" manifest="${build}/MANIFEST.MF">
+         <fileset dir="${build}">
+            <exclude name="MANIFEST.MF" unless="classloader.broken"/>
+               </fileset>
+               <fileset dir="${src}" includes="**/*.properties" />
+               <metainf dir="${src}/META-INF" />
+      </jar>
+   </target>
+
+   <target name="javadoc" depends="compile">
+          <javadoc sourcepath="${src}" destdir="${dist}/doc" packagenames="${pkg}">
+         <classpath path="${classpath}"/>
+      </javadoc>
+   </target>
+
+   <target name="clean">
+      <delete dir="${build}"/>
+      <delete dir="${dist}"/>
+   </target>
+</project>

diff --git a/app-text/trang/files/digest-trang-20030619-r3 b/app-text/trang/files/digest-trang-20030619-r3
new file mode 100644 (file)
index 0000000..e7b2932
--- /dev/null
+++ b/app-text/trang/files/digest-trang-20030619-r3
@@ -0,0 +1,3 @@
+MD5 9611ea59fda0f62fecc4a5017a72984e trang-20030619.zip 941382
+RMD160 f7dea9e4aae3e753fad2faae1304d865e30a5f6e trang-20030619.zip 941382
+SHA256 049ede1c5524fdc2958b47fe49bcf11620e36c4c6ede08f9df530eae12243343 trang-20030619.zip 941382

diff --git a/app-text/trang/trang-20030619-r3.ebuild b/app-text/trang/trang-20030619-r3.ebuild
new file mode 100644 (file)
index 0000000..c60b218
--- /dev/null
+++ b/app-text/trang/trang-20030619-r3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/trang/trang-20030619-r3.ebuild,v 1.1 2006/11/25 18:52:55 betelgeuse Exp $
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Trang: Multi-format schema converter based on RELAX NG"
+HOMEPAGE="http://thaiopensource.com/relaxng/trang.html"
+SRC_URI="http://www.thaiopensource.com/download/${P}.zip"
+LICENSE="BSD Apache-1.1"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="doc source"
+
+COMMON_DEP="
+       =dev-java/xerces-1.3*
+       =dev-java/xerces-2*"
+
+RDEPEND=">=virtual/jre-1.4
+       ${COMMON_DEP}"
+
+# javadoc does not build correctly with 1.6
+# Can't use doc? ( ) !doc? ( ) either
+# http://bugs.gentoo.org/show_bug.cgi?id=156228
+# so forcing 1.4 || 1.5
+
+DEPEND="
+       || ( =virtual/jdk-1.4* =virtual/jdk-1.5* )
+       ${COMMON_DEP}
+       dev-java/ant-core
+       app-arch/unzip"
+
+src_unpack() {
+       unpack ${A}
+
+       cd "${S}"
+       #rm -v *.jar
+       cp ${FILESDIR}/build-r1.xml "${S}/build.xml"
+
+       mkdir -p "${S}/src/"
+       cd "${S}/src"
+       unpack ./../src.zip
+}
+
+src_compile() {
+       eant jar $(use_doc) -Dproject.name=${PN} -Dpackage.name=${PN} \
+               -Dclasspath="$(java-pkg_getjars xerces-2,xerces-1.3)" \
+               -Dpkg="*"
+}
+
+src_install() {
+       java-pkg_dojar dist/*.jar
+       java-pkg_dolauncher trang \
+               --main com.thaiopensource.relaxng.translate.Driver
+       java-pkg_dohtml *.html
+
+       use doc && java-pkg_dojavadoc dist/doc
+       use source && java-pkg_dosrc src/{org,com}
+}