[gentoo-commits] repo/gentoo:master commit in: dev-java/relaxngcc/, dev-java/relaxngcc/files/

[gentoo-commits] repo/gentoo:master commit in: dev-java/relaxngcc/, dev-java/relaxngcc/files/

[Patrice Clement]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=UTF-8, Size: 3235 bytes --]

commit:     b94a572bbf0e1e67cf31a3dbf3373b0de2e3389e
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 13 01:26:28 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Aug 13 01:27:23 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b94a572b

dev-java/relaxngcc: Add dev-java/iso-relax to classpath to get package to compile with JDK 1.8, courtesy of Dominik Diesch. Fixes bug 546638.

Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 .../relaxngcc-1.12-SwitchBlockInfo.java.patch      | 11 ++++
 dev-java/relaxngcc/relaxngcc-1.12-r3.ebuild        | 71 ++++++++++++++++++++++
 2 files changed, 82 insertions(+)

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 0000000..7969a27
--- /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/relaxngcc-1.12-r3.ebuild b/dev-java/relaxngcc/relaxngcc-1.12-r3.ebuild
new file mode 100644
index 0000000..3ee7191
--- /dev/null
+++ b/dev-java/relaxngcc/relaxngcc-1.12-r3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6
+	dev-java/msv:0
+	dev-java/xsdlib:0
+	dev-java/ant-core:0
+	dev-java/iso-relax:0
+	dev-java/relaxng-datatype:0"
+
+DEPEND=">=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/*
+}

[gentoo-commits] repo/gentoo:master commit in: dev-java/relaxngcc/, dev-java/relaxngcc/files/

[James Le Cuirot]

commit:     a622a0b9a8a7343d169308f8e7a22b38ace5c6e9
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  2 23:01:47 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Mar  2 23:21:42 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a622a0b9

dev-java/relaxngcc: Remove old

Package-Manager: portage-2.2.27

 dev-java/relaxngcc/files/MANIFEST.MF-1.12   |  2 -
 dev-java/relaxngcc/files/build.xml-1.12     | 16 --------
 dev-java/relaxngcc/relaxngcc-1.12-r2.ebuild | 64 -----------------------------
 3 files changed, 82 deletions(-)

diff --git a/dev-java/relaxngcc/files/MANIFEST.MF-1.12 b/dev-java/relaxngcc/files/MANIFEST.MF-1.12
deleted file mode 100644
index df03d7e..0000000
--- a/dev-java/relaxngcc/files/MANIFEST.MF-1.12
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: relaxngcc.RelaxNGCC

diff --git a/dev-java/relaxngcc/files/build.xml-1.12 b/dev-java/relaxngcc/files/build.xml-1.12
deleted file mode 100644
index df36ef6..0000000
--- a/dev-java/relaxngcc/files/build.xml-1.12
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<project name="relaxngcc" default="jar" basedir=".">
-  <target name="compile">
-    <mkdir dir="build"/>
-	<javac debug="false" srcdir="src" destdir="build">
-      <classpath>
-        <fileset dir="lib" includes="**/*.jar"/>
-      </classpath>
-    </javac>
-  </target>
-  <target name="jar" depends="compile">
-    <jar destfile="relaxngcc.jar" manifest="MANIFEST.MF">
-      <fileset dir="build" includes="**/*.class"/>
-    </jar>
-  </target>
-</project>

diff --git a/dev-java/relaxngcc/relaxngcc-1.12-r2.ebuild b/dev-java/relaxngcc/relaxngcc-1.12-r2.ebuild
deleted file mode 100644
index d3b5d9a..0000000
--- a/dev-java/relaxngcc/relaxngcc-1.12-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 ~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"
-	epatch "${FILESDIR}"/${PV}-*.patch
-	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
-	use doc && dohtml -r doc/en/*
-
-}