diff options
| -rw-r--r-- | dev-java/poi/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-java/poi/files/poi-3.0.1-src-isDateFormat.patch | 100 | ||||
| -rw-r--r-- | dev-java/poi/poi-3.0.1-r1.ebuild | 72 |
3 files changed, 6 insertions, 174 deletions
diff --git a/dev-java/poi/ChangeLog b/dev-java/poi/ChangeLog index e0d99fa79f97..d947228e4903 100644 --- a/dev-java/poi/ChangeLog +++ b/dev-java/poi/ChangeLog @@ -1,6 +1,10 @@ # 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.48 2008/10/24 20:31:37 maekke Exp $ +# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/poi/ChangeLog,v 1.49 2009/02/15 17:33:26 caster Exp $ + + 15 Feb 2009; Vlastimil Babka <caster@gentoo.org> + -files/poi-3.0.1-src-isDateFormat.patch, -poi-3.0.1-r1.ebuild: + Cleanup. 24 Oct 2008; Markus Meier <maekke@gentoo.org> poi-3.0.2-r1.ebuild: amd64/x86 stable, bug #219664 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 deleted file mode 100644 index c9ba97f62f35..000000000000 --- a/dev-java/poi/files/poi-3.0.1-src-isDateFormat.patch +++ /dev/null @@ -1,100 +0,0 @@ -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-r1.ebuild b/dev-java/poi/poi-3.0.1-r1.ebuild deleted file mode 100644 index 88a264621175..000000000000 --- a/dev-java/poi/poi-3.0.1-r1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# 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.1-r1.ebuild,v 1.8 2008/01/10 23:13:03 caster Exp $ - -JAVA_PKG_IUSE="doc examples source" -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Java API To Access Microsoft Format Files" -HOMEPAGE="http://jakarta.apache.org/poi/" -RELEASE_DATE="20070705" -SRC_URI="mirror://apache/poi/release/src/${PN}-src-${PV}-FINAL-${RELEASE_DATE}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86" -IUSE="test" - -COMMON_DEPEND=" - =dev-java/commons-beanutils-1.7* - >=dev-java/commons-lang-2.1 - >=dev-java/commons-logging-1.1" -RDEPEND=">=virtual/jre-1.4 - ${COMMON_DEPEND}" -DEPEND=">=virtual/jdk-1.4 - ${COMMON_DEPEND} - test? ( dev-java/ant-junit )" - -S=${WORKDIR}/${P}-FINAL - -src_unpack() { - unpack ${A} - - cd "${S}" - # 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 - - cd "${S}/lib" - java-pkg_jar-from commons-logging commons-logging.jar commons-logging-1.1.jar - use test && java-pkg_jar-from --build-only junit junit.jar junit-3.8.1.jar - - cd "${S}/src/contrib/lib" - java-pkg_jar-from commons-beanutils-1.7 commons-beanutils.jar commons-beanutils-1.7.0.jar - java-pkg_jar-from commons-lang-2.1 commons-lang.jar commons-lang-2.1.jar - - java-pkg_filter-compiler jikes -} - -src_compile() { - # the same target compiles the source and the test so we just mess with - # the source directory - eant jar $(use_doc javadocs) -Ddisconnected=true \ - $(use !test && echo -Dmain.src.test=legal -Dscratchpad.src.test=legal) -} - -src_test() { - ANT_TASKS="ant-junit" eant test -Ddisconnected=true -} - -src_install() { - use doc && java-pkg_dojavadoc build/tmp/site/build/site/* - use examples && java-pkg_doexamples src/examples/* src/scratchpad/examples/* - use source && java-pkg_dosrc src/contrib/src/org src/java/org src/scratchpad/src/org - - cd build/dist - local VERSION=$(get_version_component_range 1-2) - java-pkg_newjar poi-scratchpad-${VERSION}* ${PN}-scratchpad.jar - java-pkg_newjar poi-contrib-${VERSION}* ${PN}-contrib.jar - java-pkg_newjar poi-${VERSION}* ${PN}.jar -} |