Fixed bug #515788; bumped to EAPI=5

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x77C501ED

4 files changed, 86 insertions, 4 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/Manifest b/dev-java/flute/Manifest
index 529f1bb9441a..20b3994c31ba 100644
--- a/dev-java/flute/Manifest
+++ b/dev-java/flute/Manifest
@@ -1,5 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX 1.3-rename-enum.patch 808 SHA256 1288f83a80d0db7e382e681c4751cb280ddd1e7cd648f96023b3b6cd0d51f03d SHA512 b9148cb6aa39140769463486bd1ab87b48466196137f002ed1a5f6fb9889a3ca94fda013ea4a66777fcf95add2add07161f052ab0dff92fa10441c3dfbada0c5 WHIRLPOOL c561fc79cf412f8e84a448143c3499c9fde4fa924d938fa2482062ef56e3701d028cbf53f3a905097974c2f24724a2a14b2591554a7a1c520c619ea379288c69
 AUX build.xml 860 SHA256 07fc2c3744c4e8468de1431112ac4b37d992cfe1a50505556562ddf9d7b6ebff SHA512 bd3d814e115516292aa0947648c2d4ff207ffa2a8fdbf35bc17757a38bc0f901503fb62a957621dfd01a60394f6b510fe4eca158238ea28510dba643731128ea WHIRLPOOL 4ee1bde680176511e2f387e755b8e35df99392013ebe5c8b84fb61bd71fb3cb68d37b2207a7799127bcd3d2ee11c0fbc7a3234c14015f185b01375ab94267c45
 DIST flutejava-1.3.zip 270464 SHA256 57abb83e042088a1956d6d92933ff84d6d3839e0b8477b90d77ebce5cbe3e78b SHA512 eff6ee0e863a18ba4a6d4758550cb3df9fdf1a76aadee33d14cef7b067ada06e66841a51511b8cd7f9af6c34b7e229312b223170f95d9003343ba1c0aa75ff32 WHIRLPOOL c09983d49a8a715b9283fc67d0cd7058f4cd21e311e73f986b78ce5633cfa72438740efb1c48c4c4ee4da6479000382d0b7e23cbe6a15c3c34c424c4b0aae6ac
 EBUILD flute-1.3-r1.ebuild 967 SHA256 72250028ee8b5d289676af60614888b6cb7568d53a11e12c3796e5d9785cf682 SHA512 89e7fc8fd8ca7da26b8a44144b1d875ec005225e5ce839ff5fe426558e307f5aabbf66cc73de43d411fd39c8142ceffa90ce4ca1f8da0cbbcce2349824925efc WHIRLPOOL a5a652f235056c96042702af9e0fc8d512732269c682712953508430bfafc6fa7c3fa105c30c0d3701d6b5a6ec7a92e77fea4132dcb0ee73344f4c08bee2540d
-MISC ChangeLog 1676 SHA256 e6147ced00f46f0c99624f74a376a31dcc7a3314666c444e671fc6d603c1f1a2 SHA512 0bb32c813e3bf02ac1f21621b4aaa3ff375103153bc32d56b35879a319a4adece1d074f1c9a1ef68e33ece4709fa837897ae24ec5f727631c4a88aaa65e5680a WHIRLPOOL 421b3319662fcff9b9c72ab714fd944bf35a031ab48f729da8dec0531e83be5edf3471a12d27d2d6bf8df1f2e931aa2ee15ef5a1028c7b8f64abf70db07d55f4
+EBUILD flute-1.3-r2.ebuild 1016 SHA256 1e098add804198f14b3c6439fb7bcbf2f710deb4b89703933be8dba173af6756 SHA512 e1073558653d9e1d9acb33db5ee3059cdbd991618690ae5d97b1510e23c15e6b9874f25db52aa6075ad9156c9290aaf79e0d42fd2d4addbc6c8566a78cd988a9 WHIRLPOOL ee12ae5f8c344527be7d3428f33269bab5e992b3e67f1e1ba7fdadcd062823bea74986a98397d8d7fe3a48e6dd04724e24b66460209d80f69147cdd5f4079855
+MISC ChangeLog 1846 SHA256 42e9105a7725298409bdd2f5c73765a1c2161b05ca53866e918b8832fc2a4d76 SHA512 f24fff4ef3046bce3548f6385bfdc68f3085d895bf6a7ecad23cd5791ae59e893753ce584cb9ca3b02b0f4943f6b83d9fac06c9869f61ef9fe7386bb73135073 WHIRLPOOL 8aa1b9571a5bf7908fd943117e11ba36043d34f9c8735e5acb24ac155f531c65ed20e896b65bbb3b6197d75ab9e5a3fe0f1fa4d2b5e35ac2c5db24f1d7aa1e49
 MISC metadata.xml 159 SHA256 1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b SHA512 269cf19c37f2d136b926f546ec83ffdbc1374b2b6e26f8a31f21854143380386c31bfc7b2a0b9c47fb1f7c02607ddbdd43e517cb5c3270515e465c4dd7788843 WHIRLPOOL afb402fec04cddb3184b69eb8a8d36b404edd2870fd06c8f5e99be39c341ea6fa7542e0b680fac05529522ed33838e8279381d7a6de9dbc58fe55841229d8a51
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQEcBAEBCAAGBQJTukZZAAoJEKCEBkJ3xQHtAdkIAJJz09ZPiRLEfKaZkHLammCw
+3LQnHJsShwkxRtWMvQPnmumabzN9fGnNeOM/sFxzpeBcuBoxZpbbwdv91FosvtM6
+rCniSBS4Qeu/O4PsRe4AI83j3XkkwkgcoDEvWzcQAiYsXizYloeBFYSaTHeBQOqH
+C2alZdfNGam9y2Fml4cpo9+g9Ct/7rXAiSFxcN1U29uzLPM3VITqACRWI1Jnk7uv
+SaMgPQx+jdD28YedV4GFEEOBl/teyyJLTy+OLMiFLg9AFcNDsYRbOfo2/hj8lwkA
+FBQKFqmsv5BZNk0h8TOFLg8RZojqtM4ih+V1pxjIAPdCkdVUSteHDrKg2KSnA4k=
+=5kda
+-----END PGP SIGNATURE-----
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/*
+}