From 7bc12ad39019b34bcbff464455098ab4fa8f1208 Mon Sep 17 00:00:00 2001
From: Patrice Clement <monsieurp@gentoo.org>
Date: Sat, 16 Jan 2016 12:24:27 +0000
Subject: dev-java/rngom: Add missing ressources to jar file. Fixes bug 254404.

Package-Manager: portage-2.2.26
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
---
 dev-java/rngom/rngom-20100718-r1.ebuild | 54 +++++++++++++++++++++++++++++++++
 dev-java/rngom/rngom-20100718.ebuild    | 49 ------------------------------
 2 files changed, 54 insertions(+), 49 deletions(-)
 create mode 100644 dev-java/rngom/rngom-20100718-r1.ebuild
 delete mode 100644 dev-java/rngom/rngom-20100718.ebuild

(limited to 'dev-java/rngom')

diff --git a/dev-java/rngom/rngom-20100718-r1.ebuild b/dev-java/rngom/rngom-20100718-r1.ebuild
new file mode 100644
index 000000000000..386f19f7f55f
--- /dev/null
+++ b/dev-java/rngom/rngom-20100718-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="RNGOM is an open-source Java library for parsing RELAX NG grammars"
+HOMEPAGE="https://rngom.dev.java.net/"
+SRC_URI="https://repo1.maven.org/maven2/org/kohsuke/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+CDEPEND="
+	dev-java/xsdlib:0
+	dev-java/relaxng-datatype:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	app-arch/unzip
+	>=virtual/jdk-1.6"
+
+JAVA_GENTOO_CLASSPATH="
+	xsdlib
+	relaxng-datatype
+"
+
+JAVA_RM_FILES=(
+	Token.java
+	TokenMgrError.java
+	ParseException.java
+	UCode_UCodeESC_CharStream.java
+	org/kohsuke/rngom/parse/compact/CompactSyntax.java
+	org/kohsuke/rngom/parse/compact/EOFException.java
+	org/kohsuke/rngom/parse/compact/JavaCharStream.java
+	org/kohsuke/rngom/parse/compact/CompactParseable.java
+	org/kohsuke/rngom/parse/compact/EscapeSyntaxException.java
+	org/kohsuke/rngom/parse/compact/CompactSyntaxConstants.java
+	org/kohsuke/rngom/parse/compact/CompactSyntaxTokenManager.java
+)
+
+src_compile() {
+	java-pkg-simple_src_compile
+	java-pkg_addres "${PN}.jar" . -name "*.properties"
+}
diff --git a/dev-java/rngom/rngom-20100718.ebuild b/dev-java/rngom/rngom-20100718.ebuild
deleted file mode 100644
index 58d2624bbb8d..000000000000
--- a/dev-java/rngom/rngom-20100718.ebuild
+++ /dev/null
@@ -1,49 +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 source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="RNGOM is an open-source Java library for parsing RELAX NG grammars"
-HOMEPAGE="https://rngom.dev.java.net/"
-SRC_URI="https://repo1.maven.org/maven2/org/kohsuke/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-CDEPEND="
-	dev-java/xsdlib:0
-	dev-java/relaxng-datatype:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	app-arch/unzip
-	>=virtual/jdk-1.6"
-
-JAVA_GENTOO_CLASSPATH="
-	xsdlib
-	relaxng-datatype
-"
-
-JAVA_RM_FILES=(
-	Token.java
-	TokenMgrError.java
-	ParseException.java
-	UCode_UCodeESC_CharStream.java
-	org/kohsuke/rngom/parse/compact/CompactSyntax.java
-	org/kohsuke/rngom/parse/compact/EOFException.java
-	org/kohsuke/rngom/parse/compact/JavaCharStream.java
-	org/kohsuke/rngom/parse/compact/CompactParseable.java
-	org/kohsuke/rngom/parse/compact/EscapeSyntaxException.java
-	org/kohsuke/rngom/parse/compact/CompactSyntaxConstants.java
-	org/kohsuke/rngom/parse/compact/CompactSyntaxTokenManager.java
-)
-- 
cgit v1.2.3-65-gdbad