Fixed bug #515788; bumped to EAPI=5

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 77C501ED)

3 files changed, 69 insertions, 3 deletions

diff --git a/dev-java/flute/ChangeLog b/dev-java/flute/ChangeLog
index 68b0d8a6bf6d..885078c8db4f 100644
--- a/dev-java/flute/ChangeLog
+++ b/dev-java/flute/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/flute
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/flute/ChangeLog,v 1.12 2007/10/24 04:34:35 wltjr Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/flute/ChangeLog,v 1.13 2014/07/07 07:03:46 ercpe Exp $
+
+*flute-1.3-r2 (07 Jul 2014)
+
+  07 Jul 2014; Johann Schmitz <ercpe@gentoo.org> +files/1.3-rename-enum.patch,
+  +flute-1.3-r2.ebuild:
+  Fixed bug #515788; bumped to EAPI=5
 
   24 Oct 2007; William L. Thomson Jr. <wltjr@gentoo.org>
   flute-1.3-r1.ebuild:
@@ -47,4 +53,3 @@
   +flute-1.3.ebuild:
   Initial import. Resolves bug #85116. Modified ebuild from Betelgeuse
   <petteri.raty@welho.com>
-
diff --git a/dev-java/flute/files/1.3-rename-enum.patch b/dev-java/flute/files/1.3-rename-enum.patch
new file mode 100644
index 000000000000..03e251a02f9c
--- /dev/null
+++ b/dev-java/flute/files/1.3-rename-enum.patch
@@ -0,0 +1,15 @@
+diff --git a/flute-1.3/org/w3c/flute/parser/Parser.java b/flute-1.3/org/w3c/flute/parser/Parser.java
+index 3048834..55fec8b 100644
+--- a/flute-1.3/org/w3c/flute/parser/Parser.java
++++ b/flute-1.3/org/w3c/flute/parser/Parser.java
+@@ -3497,8 +3497,8 @@ Token language;
+         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 enumeration = jj_expentries.elements(); enumeration.hasMoreElements();) {
++        int[] oldentry = (int[])(enumeration.nextElement());
+         if (oldentry.length == jj_expentry.length) {
+           exists = true;
+           for (int i = 0; i < jj_expentry.length; i++) {
diff --git a/dev-java/flute/flute-1.3-r2.ebuild b/dev-java/flute/flute-1.3-r2.ebuild
new file mode 100644
index 000000000000..ef5d02d8c483
--- /dev/null
+++ b/dev-java/flute/flute-1.3-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/flute/flute-1.3-r2.ebuild,v 1.1 2014/07/07 07:03:46 ercpe Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="sac"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Flute is an implementation for SAC"
+HOMEPAGE="http://www.w3.org/Style/CSS/SAC/"
+SRC_URI="http://www.w3.org/2002/06/flutejava-${PV}.zip"
+
+LICENSE="W3C"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE=""
+
+COMMON_DEP="dev-java/sac"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}
+	app-arch/unzip"
+
+java_prepare() {
+	rm -v flute.jar || die
+	epatch "${FILESDIR}"/${PV}-rename-enum.patch
+	cp "${FILESDIR}/build.xml" "${S}" || die
+	mkdir src || die
+	mv org src || die
+}
+
+EANT_DOC_TARGET=""
+
+src_install() {
+	java-pkg_dojar "${S}"/dist/flute.jar
+
+	use doc && java-pkg_dojavadoc doc
+	use source && java-pkg_dosrc "${S}"/src/*
+}