Include resources in the build jar, migrate to EAPI 2 and add examples use flag. Fixes bug #254055. Thanks to Martin von Gagern <Martin.vGagern@gmx.net> for fixing the resources problem.

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

4 files changed, 120 insertions, 3 deletions

diff --git a/dev-java/relaxngcc/ChangeLog b/dev-java/relaxngcc/ChangeLog
index ad6f19d41d97..47c49aea706b 100644
--- a/dev-java/relaxngcc/ChangeLog
+++ b/dev-java/relaxngcc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/relaxngcc
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/relaxngcc/ChangeLog,v 1.9 2008/03/28 18:01:38 nixnut Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/relaxngcc/ChangeLog,v 1.10 2009/04/05 22:38:16 betelgeuse Exp $
+
+*relaxngcc-1.12-r1 (05 Apr 2009)
+
+  05 Apr 2009; Petteri Räty <betelgeuse@gentoo.org>
+  +files/build.xml-1.12-r1, +relaxngcc-1.12-r1.ebuild:
+  Include resources in the build jar, migrate to EAPI 2 and add examples use
+  flag. Fixes bug #254055. Thanks to Martin von Gagern
+  <Martin.vGagern@gmx.net> for fixing the resources problem.
 
   28 Mar 2008; nixnut <nixnut@gentoo.org> relaxngcc-1.12.ebuild:
   Stable on ppc wrt bug 214778
diff --git a/dev-java/relaxngcc/Manifest b/dev-java/relaxngcc/Manifest
index a64182deede3..d9564985dd95 100644
--- a/dev-java/relaxngcc/Manifest
+++ b/dev-java/relaxngcc/Manifest
@@ -1,6 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX MANIFEST.MF-1.12 56 RMD160 68c3949db244472b61e84f7c406448b5bcc01504 SHA1 027b8bd6cfe52aeea8709945451eb9d070eb1b01 SHA256 39bd5c69bd3fe7c5c8768902bd82e65e0de4ecb35117697ea4c2d749902eb111
 AUX build.xml-1.12 472 RMD160 3039f7fb90fb1d4880c3158c70c45ee49483c373 SHA1 dea65a5bed9223db8007ef02c439cec2f902b712 SHA256 5c4e94f5b87ab8eb5c943671826df9404a6587b27148d9a84bf11ff0980577e5
+AUX build.xml-1.12-r1 1052 RMD160 aa97d1411598d56fcfee59b109448bb984043bb1 SHA1 7b97297c680737093536569afe5cacb52b1ee2f0 SHA256 bf13c856573e64f28caf5890f68823b5b849db7d353ae429ca99fd338da17312
 DIST relaxngcc-20031218.zip 2162036 RMD160 4833dc72af767439ae1c08454b3c1e95eae4a2d0 SHA1 28828977a9ee33c6531954c3b7df2118bf9bbf36 SHA256 b6a3e797e8a4d6389ecfca5d7c0218ca22966b893e8fcf5a9b6cd7a417d27f30
+EBUILD relaxngcc-1.12-r1.ebuild 1364 RMD160 8d5ec9ecdc4bf536f45cc144a443ecdfeaf9f023 SHA1 ecc0bc4ec6fc95d7cbd99a7448454a01d937666c SHA256 cbed71519b3ef55ca968f3d6a9547948eec743632b9f60aa5653441feeb45058
 EBUILD relaxngcc-1.12.ebuild 1275 RMD160 30d4092629b10535649c53b6c338fb66a0241f77 SHA1 24833756aafd4e3e8163239958affa78f4d71644 SHA256 e684e9d2a66ad6c7747adf88403d813c856e4456dca9f925605ab09b85ce4f3e
-MISC ChangeLog 1268 RMD160 74668139805d8f61ae899236a42540a00ab60212 SHA1 5b78a97a23f71bce746b6083fa51418ea0fb7d36 SHA256 22f361b1f814cde053d1fa71afc18bee40433c7118bfb032e0b0c9904eff0f22
+MISC ChangeLog 1609 RMD160 23f131c8448dc5d87074bd1fce32b83da50125d6 SHA1 608f9621aeb240fae868e2ac24826f6f153f270d SHA256 11f59e8341e3874ccae88ae7f35e37e9254a067275aef5fce1f05bf014a7f15f
 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAknZMv0ACgkQcxLzpIGCsLRTWgCgnLzrOIkXPmmjcdGxxxsILGso
+5z0An0++2SaiVHathO1UCTjKBw4eTl+Q
+=HfeV
+-----END PGP SIGNATURE-----
diff --git a/dev-java/relaxngcc/files/build.xml-1.12-r1 b/dev-java/relaxngcc/files/build.xml-1.12-r1
new file mode 100644
index 000000000000..8f1362567653
--- /dev/null
+++ b/dev-java/relaxngcc/files/build.xml-1.12-r1
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<project name="relaxngcc" default="jar" basedir=".">
+  <target name="compile">
+    <mkdir dir="build"/>
+    <javac srcdir="src" destdir="build">
+      <classpath>
+        <fileset dir="lib" includes="**/*.jar"/>
+      </classpath>
+    </javac>
+  </target>
+  <target name="jar" depends="compile">
+    <jar destfile="relaxngcc.jar">
+      <manifest>
+        <attribute name="Main-Class" value="relaxngcc.RelaxNGCC"/>
+      </manifest>
+      <fileset dir="build">
+        <include name="**/*.class"/>
+      </fileset>
+      <!--
+        For a list of resources to include, see the project.xml from the
+        upstream relaxngcc.jar contained in the base directory of the zip.
+      -->
+      <fileset dir="src">
+        <include name="plugin.jelly"/>
+        <include name="relaxngcc/runtime/*.java"/>
+        <include name="**/*.properties"/>
+        <include name="**/*.xsl"/>
+      </fileset>
+      <zipfileset src="relaxngcc.orig.zip">
+        <include name="project.xml"/>
+      </zipfileset>
+    </jar>
+  </target>
+</project>
diff --git a/dev-java/relaxngcc/relaxngcc-1.12-r1.ebuild b/dev-java/relaxngcc/relaxngcc-1.12-r1.ebuild
new file mode 100644
index 000000000000..027c3b39c0f9
--- /dev/null
+++ b/dev-java/relaxngcc/relaxngcc-1.12-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/relaxngcc/relaxngcc-1.12-r1.ebuild,v 1.1 2009/04/05 22:38:16 betelgeuse Exp $
+
+EAPI="2"
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_DATE="20031218"
+
+DESCRIPTION="RELAX NG Compiler Compiler"
+HOMEPAGE="http://relaxngcc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_DATE}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4
+	dev-java/relaxng-datatype:0
+	dev-java/msv:0
+	dev-java/ant-core:0
+	dev-java/xsdlib:0"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	${RDEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_DATE}"
+
+java_prepare() {
+	mv relaxngcc.jar relaxngcc.orig.zip || die
+
+	rm -v *.jar || die
+	rm -v sample/*/*.class || die
+
+	mkdir lib || die
+	cd lib || die
+	java-pkg_jarfrom relaxng-datatype
+	java-pkg_jarfrom msv
+	java-pkg_jarfrom xsdlib
+	java-pkg_jarfrom ant-core
+	cd "${S}" || die
+
+	cp "${FILESDIR}/build.xml-1.12-r1" build.xml || die "cp failed"
+	rm -rf "src/relaxngcc/maven"
+	java-pkg_filter-compiler jikes
+}
+
+EANT_DOC_TARGET=""
+
+src_install() {
+
+	java-pkg_dojar relaxngcc.jar
+
+	use source && java-pkg_dosrc src/*
+	use examples && java-pkg_doexamples sample
+
+	dodoc readme.txt || die
+	use doc && dohtml -r doc/en/*
+
+}