EAPI bump, some qa and dropped patch file for old version

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

5 files changed, 71 insertions, 26 deletions

diff --git a/dev-java/jexcelapi/ChangeLog b/dev-java/jexcelapi/ChangeLog
index 21af52ab731b..102f2ba83503 100644
--- a/dev-java/jexcelapi/ChangeLog
+++ b/dev-java/jexcelapi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jexcelapi
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jexcelapi/ChangeLog,v 1.22 2009/02/04 12:26:27 betelgeuse Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jexcelapi/ChangeLog,v 1.23 2014/09/07 15:17:52 ercpe Exp $
+
+*jexcelapi-2.6.8-r1 (07 Sep 2014)
+
+  07 Sep 2014; Johann Schmitz <ercpe@gentoo.org> +jexcelapi-2.6.8-r1.ebuild,
+  -files/2.5.1-jikes.patch, jexcelapi-2.6.8.ebuild:
+  EAPI bump, some qa and dropped patch file for old version
 
   04 Feb 2009; Petteri Räty <betelgeuse@gentoo.org>
   -jexcelapi-2.6.4.ebuild, -jexcelapi-2.6.6.ebuild:
@@ -85,4 +91,3 @@
   +files/2.5.1-jikes.patch, +jexcelapi-2.5.1.ebuild:
   Initial import, ebuild based on the contribution of Eddy Mulyono
   <eddymulyono@mail.com>. fixes #76209.
-
diff --git a/dev-java/jexcelapi/Manifest b/dev-java/jexcelapi/Manifest
index 9bc7560a40b6..0411f93039ee 100644
--- a/dev-java/jexcelapi/Manifest
+++ b/dev-java/jexcelapi/Manifest
@@ -1,5 +1,19 @@
-AUX 2.5.1-jikes.patch 769 SHA256 33622997d6b9ea76f087720fc4e2fc60dae5cb677c602c739074957a48b0d05a SHA512 2ccb140fcfa87a400b2ad35bbdf195d4cd0e3db60479d9ab04173798ba38f65732d2d66c4c5ea6008c0540123734171bf6461aa7742420fba06d6a32f01d49ce WHIRLPOOL 1a551268735d765461d6ec95a448f4026c04f570daf21c4662e587d56a67d974a25437d1c669c2439380497e5b2d5900435c80c8a94dabfc382f9830ca6e7459
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST jexcelapi_2_6_8.tar.gz 1925926 SHA256 12f05e4453c203b91329a65329b564e86aaa77a005101f876c4de7b648c36034 SHA512 c649dcff8647530ca719f3e546d45ac585fed46d0a220763848f6d97b3f42c871b6520aee3575202598c7aba3391f647690075b6d9d52d1c2920817ff69548c1 WHIRLPOOL 24d60ad81961b224c6d63267ee4cb4432bca5bb89c1462797dc96dce4f7fb6403741c34819c78a36312a1df9f0fce756c1d026b1672c751fc8b3a42cc9f0e3c7
-EBUILD jexcelapi-2.6.8.ebuild 1082 SHA256 8aaa8d32f97bb1c369d6bf062dbec8bfb4e90bf606071b35cae47b2f261e6b80 SHA512 b809bc9f59ff99bb1eed79edee9f89556f7a95141f4ec466669316fb6f7b51aea447903d7ee12790236be86f0cc08c951f836914bf98d367e39d8e45f0d7f17e WHIRLPOOL 461feae77fa83f3b71ae6711a633712429f53b380260dc478152887b673fd61a1b6fd4fed74181db1e616d0dc824c0d679fc6be46e327516c43dbb640f97e653
-MISC ChangeLog 2843 SHA256 624c7701f10041f3bf815d66a327146eff0e570b0a0ec418af89335034ea3ecc SHA512 c9f45ab880b4ceae1a6e78852ab464884d3e5467eb3cf62e3147fbcac76343cc1b9497f85a719f7c7221606830bd38baad2f0bf7f6e0d0f14328649256a6e286 WHIRLPOOL e97198973940c27c72173a0187870696cdf7b36afe12b0ce7032f4d82716fe21db1ca701de0029b857d8b7ab078706d63f0c20c5c2a56e38de9d4fb5909155b8
+EBUILD jexcelapi-2.6.8-r1.ebuild 1024 SHA256 03588e5a5af58c46dbc93f70e8db3ee0f91d2c3e376bdad01f6a917be9c95061 SHA512 0092fb9ae9c04edc5a6a7679dc8ab8f54ac155a9c1258e1278045aae8ce7a87f82244e791af532ee6aa579c626a1742d8c391a567987cc3f0aee4b59a8348ada WHIRLPOOL 96f95e67334e2c082b95457bc7c8247f836b7c767c4e406c9f0db18533c40e5902339b134b3236540bc75615b9f4ab831027b21a73b39f69d28e9687745e69c0
+EBUILD jexcelapi-2.6.8.ebuild 1084 SHA256 d88ef4786214e05f3420d01c947fec3832bfb2068d4a83bd8ecb85b0bb0dcc58 SHA512 2c6cbe9aa08d874bebd2a13c6052a666429255cbfae49c40a7c7cc910f8b28f9e8af376631251f0bc9383fbd65d48dd8b4186486498a40a3a825dfe4a117ab92 WHIRLPOOL 3ff607763b35f991c42261df58dea3ef8b4ac3a20418a3970a2e9a75e7e89667d6a2e9d02523ad16f1b1ea6c42a18735ee9ecc0837d46259004ed883de05f70e
+MISC ChangeLog 3062 SHA256 95c871327d0fe2cd9894a666c1746b18cf5707c04638f6a2b99e9613a65291d0 SHA512 09bddccceae92e7dbea688d3c8d5595cb1d0500e1d8c0e1521b22f2516808ae051356f2823508e8f7c83442f76468edecc8937c6f5e6c4ed689cd7ca68f97b3e WHIRLPOOL a30b05d34c78c400e3b1edde8b237db82510388e9c1adda8a322eec1a44038458662e2f66a2a6a649f81071be53f99ae25c7ebf7141835c4c9eb90e7404d142a
 MISC metadata.xml 510 SHA256 6e54d607865db79fe06ed352f7feadee9bc9d00958e5898e20eb1e3aba906e1c SHA512 6bc97b9f3c80d1fa2437332f0683bacce17ae08b99c4f15923f7f600a7130eb4001aa05b80fe4288fb9bc2196179c8adc21775aef9707a5aba7057d07696fd7a WHIRLPOOL a2dd9d06010db58306d789f6665149b692e014061cb39b0e59a4c9f67551042da3e087871d2bc05f0f5f14b13b343090f9f1a5e48a928ec7c73ae4deed82103c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQEcBAEBCAAGBQJUDHclAAoJEKCEBkJ3xQHtj64IAKQTF4nGQj3ukqEPowNbjRp/
+OzZxKTEy8sxrDTenaINH35lMVxL2AS/Jle8rUbGbn2uIkvMyPAzM82Zvo5r2LPQg
+1rTbFQ8cvhJWU0uMjGbbrXWPnD/zMQbyjlDzyoecJkZ+k31bnVWJvmX1IS9l27ao
+/OEoD6d3yIQy5ZUjFGoH8w7Fcpu2zGSmOnRoWTE/lBjtU/Ldnxp85WH7sqKwg1NK
+p6B+KsZ0+fFft3ZLUzgvevIfKCufIJ5R+WuMuCCyJjVMxCGv57vyWQQEsq31aCWU
+11KE+mjQb8LPLfGqKMhic+IxdTdIM8f1HqqOO8BrgpKkZDHoC6Tp51LEPayTNAI=
+=/hM3
+-----END PGP SIGNATURE-----
diff --git a/dev-java/jexcelapi/files/2.5.1-jikes.patch b/dev-java/jexcelapi/files/2.5.1-jikes.patch
deleted file mode 100644
index 413575950289..000000000000
--- a/dev-java/jexcelapi/files/2.5.1-jikes.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -uprN jexcelapi.orig/src/jxl/write/biff/CompoundFile.java jexcelapi/src/jxl/write/biff/CompoundFile.java
---- jexcelapi.orig/src/jxl/write/biff/CompoundFile.java	2005-01-23 15:39:35.389297104 +0100
-+++ jexcelapi/src/jxl/write/biff/CompoundFile.java	2005-01-23 15:40:59.715477576 +0100
-@@ -169,11 +169,11 @@ final class CompoundFile extends BaseCom
-    */

-   private static final class ReadPropertyStorage

-   {

--    PropertyStorage propertyStorage;

-+    jxl.biff.BaseCompoundFile.PropertyStorage propertyStorage;

-     byte[] data;

-     int number;

- 

--    ReadPropertyStorage(PropertyStorage ps, byte[] d, int n)

-+    ReadPropertyStorage(jxl.biff.BaseCompoundFile.PropertyStorage ps, byte[] d, int n)

-     {

-       propertyStorage = ps;

-       data = d;

diff --git a/dev-java/jexcelapi/jexcelapi-2.6.8-r1.ebuild b/dev-java/jexcelapi/jexcelapi-2.6.8-r1.ebuild
new file mode 100644
index 000000000000..4a2fa49ce04c
--- /dev/null
+++ b/dev-java/jexcelapi/jexcelapi-2.6.8-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jexcelapi/jexcelapi-2.6.8-r1.ebuild,v 1.1 2014/09/07 15:17:52 ercpe Exp $
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_P="${P//-/_}"
+MY_P="${MY_P//./_}"
+
+DESCRIPTION="A Java API to read, write, and modify Excel spreadsheets"
+HOMEPAGE="http://jexcelapi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/jexcelapi/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="2.5"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4"
+RDEPEND=">=virtual/jre-1.4"
+
+S=${WORKDIR}/${PN}
+
+EANT_BUILD_XML="build/build.xml"
+EANT_FILTER_COMPILER="jikes"
+EANT_BUILD_TARGET="jxl"
+EANT_DOC_TARGET="docs"
+
+java_prepare() {
+	find "${S}" -name "*.jar" -o -name "*.class" -delete || die
+}
+
+src_install() {
+	java-pkg_newjar jxl.jar  ${PN}.jar
+
+	java-pkg_dohtml index.html tutorial.html
+	use doc && java-pkg_dojavadoc docs
+	use source && java-pkg_dosrc "${S}"/src/*
+}
diff --git a/dev-java/jexcelapi/jexcelapi-2.6.8.ebuild b/dev-java/jexcelapi/jexcelapi-2.6.8.ebuild
index ed399a276b73..f2e16205c62e 100644
--- a/dev-java/jexcelapi/jexcelapi-2.6.8.ebuild
+++ b/dev-java/jexcelapi/jexcelapi-2.6.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jexcelapi/jexcelapi-2.6.8.ebuild,v 1.3 2008/10/25 17:12:28 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jexcelapi/jexcelapi-2.6.8.ebuild,v 1.4 2014/09/07 15:17:52 ercpe Exp $
 
 JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-ant-2
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/jexcelapi/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="2.5"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.4