Added patch that enables better detection of whether cell is formatted as date.

Package-Manager: portage-2.1.3.3

5 files changed, 127 insertions, 14 deletions

diff --git a/dev-java/poi/ChangeLog b/dev-java/poi/ChangeLog
index 9e4ecbe9d995..8306a83a1b00 100644
--- a/dev-java/poi/ChangeLog
+++ b/dev-java/poi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/poi
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/poi/ChangeLog,v 1.33 2007/08/04 14:01:19 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/poi/ChangeLog,v 1.34 2007/08/05 09:54:32 fordfrog Exp $
+
+*poi-3.0.1-r1 (05 Aug 2007)
+
+  05 Aug 2007; Miroslav Šulc <fordfrog@gentoo.org>
+  +files/poi-3.0.1-src-isDateFormat.patch, -poi-3.0.1.ebuild,
+  +poi-3.0.1-r1.ebuild:
+  Added patch that enables better detection of whether cell is formatted as date.
 
   04 Aug 2007; Miroslav Šulc <fordfrog@gentoo.org> poi-3.0.1.ebuild:
   Fixed SRC_URI, bug #187722.
diff --git a/dev-java/poi/Manifest b/dev-java/poi/Manifest
index d8c75b15c756..10aa4700c876 100644
--- a/dev-java/poi/Manifest
+++ b/dev-java/poi/Manifest
@@ -6,6 +6,10 @@ AUX poi-3.0-src-isDateFormat.patch 3169 RMD160 ae92c237134a5c54d82b373339ccf1446
 MD5 30d662a9ad8ad89d2f67678a7891a9a1 files/poi-3.0-src-isDateFormat.patch 3169
 RMD160 ae92c237134a5c54d82b373339ccf14464319c50 files/poi-3.0-src-isDateFormat.patch 3169
 SHA256 3a19e3f9e44e92104f87f80a7e1771bb1f0718da393cf8c5396dded65870becc files/poi-3.0-src-isDateFormat.patch 3169
+AUX poi-3.0.1-src-isDateFormat.patch 3165 RMD160 94843083983c202c06c77db7a476b054feb980be SHA1 767122e8cb6d69a713940ffa9a2e42ea91a8832e SHA256 cacdab036228f97742af4bf8e5ca0901d794da67b0c96bfd3502e2c338f99a02
+MD5 0b0ea499a72af0c10a722a59fac75e41 files/poi-3.0.1-src-isDateFormat.patch 3165
+RMD160 94843083983c202c06c77db7a476b054feb980be files/poi-3.0.1-src-isDateFormat.patch 3165
+SHA256 cacdab036228f97742af4bf8e5ca0901d794da67b0c96bfd3502e2c338f99a02 files/poi-3.0.1-src-isDateFormat.patch 3165
 DIST poi-src-2.5.1-final-20040804.tar.gz 6870414 RMD160 47707ec7db9cb5b2650d6eddaf0f351fee3237f5 SHA1 3d7f211e47f58007c3d0bcf891adba33d25482d5 SHA256 783c6c36b9762aafd3386adcfbe71ad46aaa14d9fe20545c4a60eb591cfe0cc1
 DIST poi-src-3.0-FINAL-20070503.tar.gz 16284462 RMD160 e4db3f249324ca84fb2b7b99d96c1879ebaf08ca SHA1 0cb36b01856649fdd8152d98ba999f44289dc89f SHA256 48a5aabb873d4cc654c95acf6576868d7a8a3ee97e1c6418e1d716698b6efa76
 DIST poi-src-3.0.1-FINAL-20070705.tar.gz 18139297 RMD160 4905689c285dfcdaea4e6b8549fa5f6931777367 SHA1 8071fa954fc7be44d06652e3ef7dba3f8e8e0808 SHA256 f8a1bd7593310b53bbb7981c4f680661801011aa489bf760341c5ffa10f5cce8
@@ -17,14 +21,14 @@ EBUILD poi-3.0-r1.ebuild 2111 RMD160 edc7276904d52ddf239fd96057de200f59a33f7a SH
 MD5 f925e498bdba6cd5256fa0fb73f77de5 poi-3.0-r1.ebuild 2111
 RMD160 edc7276904d52ddf239fd96057de200f59a33f7a poi-3.0-r1.ebuild 2111
 SHA256 724c8a429c17426459aedf139185eada5a3cd032b875ae6cdc4cd2f4abf98f10 poi-3.0-r1.ebuild 2111
-EBUILD poi-3.0.1.ebuild 2103 RMD160 029868f95beeff753970536c6390b69ecd59d74b SHA1 243bf7b40b157a0d6c40ca3fbc59d00edb9caebb SHA256 e37945ad48102bbcd52f2614effe46c13881a8f7ab83abdf36a852db1c7d9bfc
-MD5 6b64bc6d6a160db95ef599afbae67ad6 poi-3.0.1.ebuild 2103
-RMD160 029868f95beeff753970536c6390b69ecd59d74b poi-3.0.1.ebuild 2103
-SHA256 e37945ad48102bbcd52f2614effe46c13881a8f7ab83abdf36a852db1c7d9bfc poi-3.0.1.ebuild 2103
-MISC ChangeLog 4527 RMD160 e07e9da164b4851c64ee903d604885a4363a4846 SHA1 d1f0fb22609e2eaefffe4b4bfb055f5e912de276 SHA256 47c97c3484e92fd8dcc4aac58c02bf6da931c93fc9033bfd8396195370ebca70
-MD5 81e0d5f4a73879b28d285416a45e16a1 ChangeLog 4527
-RMD160 e07e9da164b4851c64ee903d604885a4363a4846 ChangeLog 4527
-SHA256 47c97c3484e92fd8dcc4aac58c02bf6da931c93fc9033bfd8396195370ebca70 ChangeLog 4527
+EBUILD poi-3.0.1-r1.ebuild 2219 RMD160 17e6fc05d47f60d89e59cc1dce6ffc2770c379c2 SHA1 488d12095b0ac0515393b49395a51ba712581039 SHA256 f3710939cc865cc74242efd02ec4700458d597dab98422d245785689266e5164
+MD5 21d8d2f68e697bf5a26433d9da2b6720 poi-3.0.1-r1.ebuild 2219
+RMD160 17e6fc05d47f60d89e59cc1dce6ffc2770c379c2 poi-3.0.1-r1.ebuild 2219
+SHA256 f3710939cc865cc74242efd02ec4700458d597dab98422d245785689266e5164 poi-3.0.1-r1.ebuild 2219
+MISC ChangeLog 4777 RMD160 d69e90422a3ed93593c6fcd09fdadf0bb4724c91 SHA1 70b30d73e3a2c3d636f1c845a85c6ef6af1f3887 SHA256 e22c2947bdcaf732310e9c1bab10743773ea96bf95fdadb3357e547ef1e6a338
+MD5 39b58c1a866d71adda898c36381055bd ChangeLog 4777
+RMD160 d69e90422a3ed93593c6fcd09fdadf0bb4724c91 ChangeLog 4777
+SHA256 e22c2947bdcaf732310e9c1bab10743773ea96bf95fdadb3357e547ef1e6a338 ChangeLog 4777
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -35,6 +39,6 @@ SHA256 f35e533477f27bb7a77aa9cee9a58abbc90eafddd334b0b1364237733110ec44 files/di
 MD5 ea8f76271c168dac230c84b92a4fee0b files/digest-poi-3.0-r1 286
 RMD160 37a83c503a01666940229bf98551953704c1b2ea files/digest-poi-3.0-r1 286
 SHA256 2c25f03585175e624b8a3abbcdd873cb6a7d129bc96fcc9bebc09126c4359530 files/digest-poi-3.0-r1 286
-MD5 58b296fa01ef8f706895f1f77e7bb716 files/digest-poi-3.0.1 292
-RMD160 fb928a793725d5df905eb69c55ddaf1d0aaf44c1 files/digest-poi-3.0.1 292
-SHA256 b5683896f472c185f75a7559ec58b5f517591b3dbeaedace38202be8510df0ff files/digest-poi-3.0.1 292
+MD5 58b296fa01ef8f706895f1f77e7bb716 files/digest-poi-3.0.1-r1 292
+RMD160 fb928a793725d5df905eb69c55ddaf1d0aaf44c1 files/digest-poi-3.0.1-r1 292
+SHA256 b5683896f472c185f75a7559ec58b5f517591b3dbeaedace38202be8510df0ff files/digest-poi-3.0.1-r1 292
diff --git a/dev-java/poi/files/digest-poi-3.0.1 b/dev-java/poi/files/digest-poi-3.0.1-r1
index 0d4f1442bdf5..0d4f1442bdf5 100644
--- a/dev-java/poi/files/digest-poi-3.0.1
+++ b/dev-java/poi/files/digest-poi-3.0.1-r1
diff --git a/dev-java/poi/files/poi-3.0.1-src-isDateFormat.patch b/dev-java/poi/files/poi-3.0.1-src-isDateFormat.patch
new file mode 100644
index 000000000000..c9ba97f62f35
--- /dev/null
+++ b/dev-java/poi/files/poi-3.0.1-src-isDateFormat.patch
@@ -0,0 +1,100 @@
+diff -ru poi.original/src/java/org/apache/poi/hssf/model/Workbook.java poi/src/java/org/apache/poi/hssf/model/Workbook.java
+--- poi.original/src/java/org/apache/poi/hssf/model/Workbook.java	2006-01-03 12:41:36.000000000 +0100
++++ poi/src/java/org/apache/poi/hssf/model/Workbook.java	2006-11-03 21:10:29.000000000 +0100
+@@ -103,6 +103,25 @@
+ 
+     private static POILogger   log = POILogFactory.getLogger(Workbook.class);
+ 
++  /**
++   * The date strings to look for.
++   */
++  private static final String[] dateStrings = new String[]
++  {
++    "dd",
++    "mm",
++    "yy",
++    "hh",
++    "ss",
++    "/m",
++    "m/",
++    "-m",
++    "m-",
++    "/d",
++    "d/",
++    "-d",
++    "d-"
++  };
+     /**
+      * Creates new Workbook with no intitialization --useless right now
+      * @see #createWorkbook(List)
+@@ -2221,6 +2234,57 @@
+     {
+         return drawingManager;
+     }
++    
++    public FormatRecord getFormat(final short index) {
++        FormatRecord foundFormat = null;
++        Iterator iterator = formats.iterator();
++        while (iterator.hasNext()) {
++            final FormatRecord format = (FormatRecord) iterator.next();
++            if (format.getIndexCode() == index) {
++                foundFormat = format;
++                break;
++            }
++        }
++        return foundFormat;
++    }
+ 
+-}
++    public boolean isDateFormat(final short index) {
++        boolean isDate = false;
++        final FormatRecord format = getFormat(index);
++        if (format != null) {
++            switch(format.getIndexCode()) {
++                // Internal Date Formats as described on page 427 in
++                // Microsoft Excel Dev's Kit...
++                case 0x0e:
++                case 0x0f:
++                case 0x10:
++                case 0x11:
++                case 0x12:
++                case 0x13:
++                case 0x14:
++                case 0x15:
++                case 0x16:
++                case 0x2d:
++                case 0x2e:
++                case 0x2f:
++                    isDate = true;
++                    break;
+ 
++                default:
++                    break;
++            }
++
++            if (!isDate) {
++                final String formatString = format.getFormatString().toLowerCase();
++                for (int i = 0; i < dateStrings.length; i++) {
++                    final String dateString = dateStrings[i];
++                    if (formatString.indexOf(dateString) != -1) {
++                        isDate = true;
++                        break;
++                    }
++                }
++            }
++        }
++        return isDate;
++    }
++}
+diff -ru poi.original/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java poi/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
+--- poi.original/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java	2006-07-27 16:15:11.000000000 +0200
++++ poi/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java	2006-11-03 21:09:50.000000000 +0100
+@@ -1279,4 +1279,8 @@
+         byte[] bytes = new byte[16];
+         return bytes;
+     }
++    
++    public boolean isDateFormat(final short index) {
++        return workbook.isDateFormat(index);
++    }
+ }
diff --git a/dev-java/poi/poi-3.0.1.ebuild b/dev-java/poi/poi-3.0.1-r1.ebuild
index 707ff5202d46..dded97fb11c3 100644
--- a/dev-java/poi/poi-3.0.1.ebuild
+++ b/dev-java/poi/poi-3.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/poi/poi-3.0.1.ebuild,v 1.2 2007/08/04 14:01:19 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/poi/poi-3.0.1-r1.ebuild,v 1.1 2007/08/05 09:54:32 fordfrog Exp $
 
 JAVA_PKG_IUSE="doc examples source"
 inherit java-pkg-2 java-ant-2
@@ -31,7 +31,9 @@ src_unpack() {
 	unpack ${A}
 
 	cd "${S}"
-	#epatch ${FILESDIR}/${P}-src-isDateFormat.patch
+	# Patch that adds unofficial support for detection whether cell is
+	# date/time format till upstream solves that
+	epatch ${FILESDIR}/${P}-src-isDateFormat.patch
 
 	find -name "*.jar" | xargs rm -v