Fixed error in tests caused by applying patch that fixes determination of date/time formats in cells

Package-Manager: portage-2.1.4.4

5 files changed, 59 insertions, 7 deletions

diff --git a/dev-java/log4j/Manifest b/dev-java/log4j/Manifest
index cfcda073b556..6e7ab9820f84 100644
--- a/dev-java/log4j/Manifest
+++ b/dev-java/log4j/Manifest
@@ -1,7 +1,7 @@
 DIST apache-log4j-1.2.15.tar.gz 2099264 RMD160 280adfcd45c291d5bd45fbc5d5a9b0585374e4e0 SHA1 d6daea1586b932b1e38dc3fbac68624372bec6db SHA256 f5d9f6aa78b9156ae2de2a32d0f26507d2e73db4993d501db2e79f0bd803ab31
 DIST logging-log4j-1.2.14.tar.gz 2771881 RMD160 d640c0182deebe1aabf14105b7b89294601bacce SHA1 2365021f8f277e77e281b0e01333ecea7c721e3e SHA256 51e4fcb3c3677fcdb9fe45ca0f73378680537491c9c9e65a9b63c7f54678f90c
 EBUILD log4j-1.2.14-r1.ebuild 2203 RMD160 9645a72741ecbf6ded33bbe55470da76ab5b0dc4 SHA1 cd46504ba69a3f9d5f33ee3baa9d6b827fc8120d SHA256 cb81f2366f02c0b8b025e86356131eef6e258984fef0e92265990d509d8b2d5e
-EBUILD log4j-1.2.14-r2.ebuild 2220 RMD160 7112aab272d9b194d6bd07472b00de0687f8694c SHA1 ae6f0b7628a94696aa92c2cabc10c40c221f4d95 SHA256 d7b156f09a60a2d4987d32179c5441d321d09d67e4179e5bb1a5316357c29a37
+EBUILD log4j-1.2.14-r2.ebuild 2225 RMD160 195da08465997b60f00d4e8bc85f47b2afa59a80 SHA1 894e173142b02de4d184c01942f1f4f097322523 SHA256 17c90ae9a7e57efad61e41e207cd62abf035464960c6cc465d2fe212ee903764
 EBUILD log4j-1.2.15.ebuild 2388 RMD160 08ed62c62754e06a0f8180e11d1773ddb29a5a40 SHA1 df241e6ba03acf13286f77ba7093ac74f9e8d7ee SHA256 c56cc24a32f46d25fcad608a13484893ac3cea0b7f89e496f4e9045f4a977935
-MISC ChangeLog 7657 RMD160 8ec76d38ddc4c1b7a4e42f6dacd4b3c467b0f9e3 SHA1 e8a72c3f57db1b7eb4226fe778bd66a035290e75 SHA256 e98ffb1eebcbbc7a3cfedbb674252e9470cdc31d061a9cd3c8e816ecdc50b838
+MISC ChangeLog 7752 RMD160 b6c515b0175130ff0593c5a153fe33c84f6fae99 SHA1 54599e5904969d9850418e731e9f014c6d76ba55 SHA256 c075773f447d4de2fd2ac729bdc792de46d55497c19d97bde443a00fefdde888
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
diff --git a/dev-java/poi/ChangeLog b/dev-java/poi/ChangeLog
index 963888aefb7f..0beac8dc6071 100644
--- a/dev-java/poi/ChangeLog
+++ b/dev-java/poi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/poi
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/poi/ChangeLog,v 1.43 2008/02/07 12:02:40 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/poi/ChangeLog,v 1.44 2008/02/20 19:22:49 fordfrog Exp $
+
+  20 Feb 2008; Miroslav Šulc <fordfrog@gentoo.org>
+  +files/poi-3.0.2-isADateFormatTest.patch, poi-3.0.2-r1.ebuild:
+  Fixed error in tests caused by applying patch that fixes determination of
+  date/time formats in cells
 
 *poi-3.0.2-r1 (07 Feb 2008)
 
diff --git a/dev-java/poi/Manifest b/dev-java/poi/Manifest
index 7599e411cd1e..1755851dda53 100644
--- a/dev-java/poi/Manifest
+++ b/dev-java/poi/Manifest
@@ -1,8 +1,9 @@
 AUX poi-3.0.1-src-isDateFormat.patch 3165 RMD160 94843083983c202c06c77db7a476b054feb980be SHA1 767122e8cb6d69a713940ffa9a2e42ea91a8832e SHA256 cacdab036228f97742af4bf8e5ca0901d794da67b0c96bfd3502e2c338f99a02
 AUX poi-3.0.2-isADateFormat.patch 426 RMD160 9e632f537b421f93072478efab6e47292ad19d34 SHA1 ede819cc16cbef6cce227659e1e4af7391a49af5 SHA256 ba13f092b7538ddf98da6cd895584f71367cbe8d0a0c58d9730db28f904d95e1
+AUX poi-3.0.2-isADateFormatTest.patch 1510 RMD160 d2855d9a712fe4f53e736dd2dd1e6618462c52bd SHA1 2e49d0ed6ab4cf46aae1bdd96a0a7f5086a977ad SHA256 bf85316356588eda2c4815a34eeb133b2771642b78c5d47140120d4af737f9ce
 DIST poi-src-3.0.1-FINAL-20070705.tar.gz 18139297 RMD160 4905689c285dfcdaea4e6b8549fa5f6931777367 SHA1 8071fa954fc7be44d06652e3ef7dba3f8e8e0808 SHA256 f8a1bd7593310b53bbb7981c4f680661801011aa489bf760341c5ffa10f5cce8
 DIST poi-src-3.0.2-FINAL-20080204.tar.gz 19034308 RMD160 4260e3094f206a837610f31a15cd7edf080a147b SHA1 8ecdf131ca6e4a52a059405e63d92f4854a2c69e SHA256 38a3d599fb75eaaa7c70fec230a9a88c192080b4c07fc9e7c7a31f8b26c8e4eb
 EBUILD poi-3.0.1-r1.ebuild 2248 RMD160 9194f795b77edddfe0f2e00492b3ed39af9e7836 SHA1 87c370ae16c7f66bf3f54b70040e0a4289b2ba6d SHA256 721d12735bd40cd826ca6cf04d4dc09fb76150f16d32523aa4ee38f9d75b96cd
-EBUILD poi-3.0.2-r1.ebuild 2296 RMD160 c53e9bae90a2fdbf9bcd16faae0f83c6fa0d93a1 SHA1 e01ad5dfef8e5687a8134d626f1c66e72bbae90b SHA256 37fe60a0c0634301e3b1457780993100f7467e7fbcc785821b39ae37bd3819ae
-MISC ChangeLog 6049 RMD160 10732a77e584d3bc0317724ea74ff8545a42e4c7 SHA1 6288990c9bf032256c3c3d97de4229527bf1f75b SHA256 7475ae04a062afd19525f70c7a11ef89c9e86f06b87cceda810511841661b1e6
+EBUILD poi-3.0.2-r1.ebuild 2357 RMD160 733edf560f5ad0842c09a612c48c4815ccee5e14 SHA1 60b1e7b693d7a0dd10eec1a4346ee90737e6546f SHA256 8c9a96d14cd22acd50d3c2c6a615d7ea5b124340a56270d6a51a81ff8509b854
+MISC ChangeLog 6272 RMD160 8227c87f5df266a5810e5675d1e030a9299df1a4 SHA1 d0c4104ceb08b05a7bf69b4bf9af1747f3a8350e SHA256 b06615247d7976c6dea7cbbc2d485ffa299fe08645f4f302fad6c033494c656f
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
diff --git a/dev-java/poi/files/poi-3.0.2-isADateFormatTest.patch b/dev-java/poi/files/poi-3.0.2-isADateFormatTest.patch
new file mode 100644
index 000000000000..b21c1d64316b
--- /dev/null
+++ b/dev-java/poi/files/poi-3.0.2-isADateFormatTest.patch
@@ -0,0 +1,45 @@
+--- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java	2007/12/04 17:06:57	601004
++++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java	2008/02/07 12:39:12	619382
+@@ -228,6 +228,7 @@
+     			"yyyy-mm-dd", "yyyy/mm/dd", "yy/mm/dd", "yy/mmm/dd",
+     			"dd/mm/yy", "dd/mm/yyyy", "dd/mmm/yy",
+     			"dd-mm-yy", "dd-mm-yyyy",
++    			"DD-MM-YY", "DD-mm-YYYY",
+     			"dd\\-mm\\-yy", // Sometimes escaped
+     			
+     			// These crazy ones are valid
+@@ -242,15 +243,33 @@
+     		assertTrue( HSSFDateUtil.isADateFormat(formatId, formats[i]) );
+     	}
+     	
++    	// Then time based ones too
++    	formats = new String[] {
++    			"yyyy-mm-dd hh:mm:ss", "yyyy/mm/dd HH:MM:SS", 
++    			"mm/dd HH:MM", "yy/mmm/dd SS",
++    	};
++    	for(int i=0; i<formats.length; i++) {
++    		assertTrue( HSSFDateUtil.isADateFormat(formatId, formats[i]) );
++    	}
++    	
+     	// Then invalid ones
+     	formats = new String[] {
+-    			"yyyy:mm:dd", 
++    			"yyyy*mm*dd", 
+     			"0.0", "0.000",
+     			"0%", "0.0%",
+     			"", null
+     	};
+     	for(int i=0; i<formats.length; i++) {
+     		assertFalse( HSSFDateUtil.isADateFormat(formatId, formats[i]) );
++    	}
++    	
++    	// And these are ones we probably shouldn't allow,
++    	//  but would need a better regexp
++    	formats = new String[] {
++    			"yyyy:mm:dd", 
++    	};
++    	for(int i=0; i<formats.length; i++) {
++    	//	assertFalse( HSSFDateUtil.isADateFormat(formatId, formats[i]) );
+     	}
+     }
+
diff --git a/dev-java/poi/poi-3.0.2-r1.ebuild b/dev-java/poi/poi-3.0.2-r1.ebuild
index 85179bda35b6..d0f9098a4994 100644
--- a/dev-java/poi/poi-3.0.2-r1.ebuild
+++ b/dev-java/poi/poi-3.0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/poi/poi-3.0.2-r1.ebuild,v 1.1 2008/02/07 12:02:40 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/poi/poi-3.0.2-r1.ebuild,v 1.2 2008/02/20 19:22:49 fordfrog Exp $
 
 EAPI=1
 JAVA_PKG_IUSE="doc examples source"
@@ -32,9 +32,10 @@ src_unpack() {
 	unpack ${A}
 
 	cd "${S}"
-	# Patch that adds unofficial fix for detection of custom date/time formats
+	# Patch that adds official fix for detection of custom date/time formats
 	# See bug: http://issues.apache.org/bugzilla/show_bug.cgi?id=44373
 	epatch "${FILESDIR}/${P}-isADateFormat.patch"
+	use test && epatch "${FILESDIR}/${P}-isADateFormatTest.patch"
 
 	find -name "*.jar" | xargs rm -v