gentoo resync : 14.07.2018

6 files changed, 150 insertions, 0 deletions

diff --git a/dev-java/relaxngcc/Manifest b/dev-java/relaxngcc/Manifest
new file mode 100644
index 000000000000..e2b0b2582030
--- /dev/null
+++ b/dev-java/relaxngcc/Manifest
@@ -0,0 +1,6 @@
+AUX 1.12-fix-jdk-1.7-enum.patch 925 BLAKE2B 56bc32e9317027c7ff5b9a72f5bc9074fd31ec9e6f4193f9ef3f3726cbc5cd479a3de5028ba99aa4648fd8de8143fdc94624c6db2f6af5bd864cc5577edc1e1f SHA512 5a459bdd6d4d9f173f4e0cd7f23476ef5655f5918cc291eda43c0b847ad190f81d10db55bb76126804dc84efe5122335c11849577130aae09c5e73ca801c5a40
+AUX build.xml-1.12-r1 1052 BLAKE2B f80d529a495fd5ab37788a3a50d03ffa6eb9f7196d6b31007d90fa1d94c7359ba8155340fef0550f7f67ab5b4f053e9920cb2941f3518097b4555dd1121d5e10 SHA512 cd0412dd263ac0e933216bdb99cdb3f45e0ff58f0c836d62a6bbaf57a3cc984980dd76ec9c7791c8719cdb56e80991ab4a5f716919570321169cfeeb8b191854
+AUX relaxngcc-1.12-SwitchBlockInfo.java.patch 509 BLAKE2B 198306ff259d830ce1db6fc2d4d38a926fb64fccdb81c07f51a64a3ef47cd4ab6258a7efa35deb1e6719dee0b5513e8b7068c786bff75b15b408d20c0a1a87e4 SHA512 d9e8fbf64b588a66a44af5a768adad5099f970a8c705898928a73704e6e809f5ba7a8d851bf4ed356dc47c0b0a0a4674583daf87e0271a7edf171e529886f815
+DIST relaxngcc-20031218.zip 2162036 BLAKE2B a5efd9941229e6dbc2d2d223e9d2799a0f56cc6010331175e16cfa2b77b886c060062fd7206bf7d1f9cbbc831a2d06efee176460ced81620ec8ceaed89334921 SHA512 df797243c095e79e9018d8f17deb3963631128718428ff325af6910e285e649f27c270b63101f2b5833ddde23814c54a662397000f433f8a32cea30917760d4b
+EBUILD relaxngcc-1.12-r3.ebuild 1384 BLAKE2B d64cac19e4b27abfdc3fba1642ac09335a2787aaa71134eca67ccee5a1fecb655e62f24bbf6a1b3a76639e2cd96485e06e4d47d928841824c1d0426100dc1485 SHA512 4c634f63561b9814807065ab30be9ef0e2d01877bfa088240d2070f0e5da54d566a4ad4570b285486f7be1c49a623397463691701146960b3e0d2faf5b0bc61e
+MISC metadata.xml 315 BLAKE2B d93ab01a7b525398306e5c60dfe4949a084b824f80b0099f5aa17dcc2b4d3a0997be633179e131c52972e594d5aaecb5d62bc40cb6df3a3eb606d0dd3d8a9e8e SHA512 3fd8f24dacd7aae0d04568ce951c8d9559e0c25dc52f7713136d3f4398c14873ff8420e0d12f858d3006397e9539a7278a21ec85cd549ee1aad516063738caa3
diff --git a/dev-java/relaxngcc/files/1.12-fix-jdk-1.7-enum.patch b/dev-java/relaxngcc/files/1.12-fix-jdk-1.7-enum.patch
new file mode 100644
index 000000000000..69de6caaa184
--- /dev/null
+++ b/dev-java/relaxngcc/files/1.12-fix-jdk-1.7-enum.patch
@@ -0,0 +1,15 @@
+diff --git a/relaxngcc-20031218/src/relaxngcc/javabody/JavaBodyParser.java b/relaxngcc-20031218/src/relaxngcc/javabody/JavaBodyParser.java
+index b2f0e5e..bca566f 100644
+--- a/relaxngcc-20031218/src/relaxngcc/javabody/JavaBodyParser.java
++++ b/relaxngcc-20031218/src/relaxngcc/javabody/JavaBodyParser.java
+@@ -6850,8 +6850,8 @@ public class JavaBodyParser implements JavaBodyParserConstants {
+         jj_expentry[i] = jj_lasttokens[i];

+       }

+       boolean exists = false;

+-      for (java.util.Enumeration enum = jj_expentries.elements(); enum.hasMoreElements();) {

+-        int[] oldentry = (int[])(enum.nextElement());

++      for (java.util.Enumeration enumx = jj_expentries.elements(); enumx.hasMoreElements();) {

++        int[] oldentry = (int[])(enumx.nextElement());

+         if (oldentry.length == jj_expentry.length) {

+           exists = true;

+           for (int i = 0; i < jj_expentry.length; i++) {

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/files/relaxngcc-1.12-SwitchBlockInfo.java.patch b/dev-java/relaxngcc/files/relaxngcc-1.12-SwitchBlockInfo.java.patch
new file mode 100644
index 000000000000..7969a27da882
--- /dev/null
+++ b/dev-java/relaxngcc/files/relaxngcc-1.12-SwitchBlockInfo.java.patch
@@ -0,0 +1,11 @@
+--- src/relaxngcc/builder/SwitchBlockInfo.java.orig	2015-08-13 01:20:52.344000000 +0000
++++ src/relaxngcc/builder/SwitchBlockInfo.java	2015-08-13 01:21:27.424000000 +0000
+@@ -66,8 +66,6 @@
+             

+             if(prologue!=null) sv.add(prologue);

+             

+-            //elsecode, nullならerrorHandleMethodで閉じる

+-            

+             CDBlock terminal = elsecode;

+             if(terminal==null && errorHandleMethod!=null)

+                 terminal = new CDBlock(errorHandleMethod);

diff --git a/dev-java/relaxngcc/metadata.xml b/dev-java/relaxngcc/metadata.xml
new file mode 100644
index 000000000000..2f5a2039e705
--- /dev/null
+++ b/dev-java/relaxngcc/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">relaxngcc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/relaxngcc/relaxngcc-1.12-r3.ebuild b/dev-java/relaxngcc/relaxngcc-1.12-r3.ebuild
new file mode 100644
index 000000000000..db4dfd79d2bc
--- /dev/null
+++ b/dev-java/relaxngcc/relaxngcc-1.12-r3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+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 x86"
+IUSE=""
+
+CDEPEND="dev-java/msv:0
+	dev-java/xsdlib:0
+	dev-java/ant-core:0
+	dev-java/iso-relax:0
+	dev-java/relaxng-datatype:0"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6
+	app-arch/unzip"
+
+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 msv
+	java-pkg_jarfrom xsdlib
+	java-pkg_jarfrom ant-core
+	java-pkg_jarfrom iso-relax
+	java-pkg_jarfrom relaxng-datatype
+
+	cd "${S}" || die
+
+	cp "${FILESDIR}/build.xml-1.12-r1" build.xml || die "cp failed"
+
+	epatch \
+		"${FILESDIR}"/${PV}-*.patch \
+		"${FILESDIR}"/"${P}"-SwitchBlockInfo.java.patch
+
+	rm -rf "src/relaxngcc/maven"
+	java-pkg_filter-compiler jikes
+}
+
+EANT_DOC_TARGET=""
+
+src_install() {
+	java-pkg_dojar "${PN}".jar
+
+	use source && java-pkg_dosrc src/*
+	use examples && java-pkg_doexamples sample
+
+	dodoc readme.txt
+	use doc && dohtml -r doc/en/*
+}