stable on ppc

Package-Manager: portage-2.0.51.21

6 files changed, 30 insertions, 94 deletions

diff --git a/dev-java/poi/ChangeLog b/dev-java/poi/ChangeLog
index eee10a5754ed..e3cf4ab9c3c2 100644
--- a/dev-java/poi/ChangeLog
+++ b/dev-java/poi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/poi
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/poi/ChangeLog,v 1.8 2005/02/06 01:06:21 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/poi/ChangeLog,v 1.9 2005/05/04 20:27:19 luckyduck Exp $
+
+  04 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  -files/poi-2.0-jikes-fix.patch, -poi-2.0.ebuild, poi-2.5-r1.ebuild:
+  stable on ppc
 
   06 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> poi-2.5-r1.ebuild,
   -poi-2.5.ebuild:
diff --git a/dev-java/poi/Manifest b/dev-java/poi/Manifest
index 21b879bec897..772339895129 100644
--- a/dev-java/poi/Manifest
+++ b/dev-java/poi/Manifest
@@ -1,8 +1,15 @@
-MD5 e090af0076bce0d5df7cd71ad0c4a5c3 poi-2.5-r1.ebuild 2078
-MD5 ac996b2d66d603fec4cbcaeb56ed6222 poi-2.0.ebuild 1152
-MD5 a3dfb8f9b68c6328c10bc07305e10ae9 ChangeLog 1410
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 85113a6dff61c8120fb665791d568945 poi-2.5-r1.ebuild 1897
+MD5 d1c52f228a52df57e2faf154b6cfb4b1 ChangeLog 1549
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 023344518eb201171e9d2ff652b476e7 files/digest-poi-2.0 79
-MD5 bf71154ca919a88d8c12da29e33ef4d9 files/poi-2.0-jikes-fix.patch 1190
 MD5 34ac7de875dec815d44a2bdbf7f4a64f files/digest-poi-2.5-r1 79
 MD5 bf71154ca919a88d8c12da29e33ef4d9 files/poi-2.5-jikes-fix.patch 1190
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCeTA+06ebR+OMO78RAt30AKCGnOc7hEcxibJfa90HVc58wygIUACfbyky
+2eDkqZJcE3L8nJOKlmqYhaA=
+=iZ1j
+-----END PGP SIGNATURE-----
diff --git a/dev-java/poi/files/digest-poi-2.0 b/dev-java/poi/files/digest-poi-2.0
deleted file mode 100644
index 42bc83d815cf..000000000000
--- a/dev-java/poi/files/digest-poi-2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 39a37286e3cc35b906f4a4415975ea55 poi-src-2.0-final-20040126.tar.gz 5705940
diff --git a/dev-java/poi/files/poi-2.0-jikes-fix.patch b/dev-java/poi/files/poi-2.0-jikes-fix.patch
deleted file mode 100644
index 047758a76ab1..000000000000
--- a/dev-java/poi/files/poi-2.0-jikes-fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur /home/keanu/tmp/poi/src/scratchpad/src/org/apache/poi/hdf/extractor/util/BTreeSet.java ./src/scratchpad/src/org/apache/poi/hdf/extractor/util/BTreeSet.java
---- /home/keanu/tmp/poi/src/scratchpad/src/org/apache/poi/hdf/extractor/util/BTreeSet.java	2004-02-22 12:19:33.000000000 +0100
-+++ ./src/scratchpad/src/org/apache/poi/hdf/extractor/util/BTreeSet.java	2004-07-22 16:32:49.563004792 +0200
-@@ -212,7 +212,7 @@
-     public static class Entry {

- 

-         public Object element;

--        public BTreeNode child;

-+        public org.apache.poi.hdf.extractor.util.BTreeSet.BTreeNode child;

-     }

- 

- 

-diff -Naur /home/keanu/tmp/poi/src/scratchpad/src/org/apache/poi/hdf/model/util/BTreeSet.java ./src/scratchpad/src/org/apache/poi/hdf/model/util/BTreeSet.java
---- /home/keanu/tmp/poi/src/scratchpad/src/org/apache/poi/hdf/model/util/BTreeSet.java	2004-02-22 12:19:35.000000000 +0100
-+++ ./src/scratchpad/src/org/apache/poi/hdf/model/util/BTreeSet.java	2004-07-22 16:34:19.623313544 +0200
-@@ -294,7 +294,7 @@
-     {

- 

-         public Object element;

--        public BTreeNode child;

-+        public org.apache.poi.hdf.model.util.BTreeSet.BTreeNode child;

-     }

- 

- 

diff --git a/dev-java/poi/poi-2.0.ebuild b/dev-java/poi/poi-2.0.ebuild
deleted file mode 100644
index 3b2a2ebeda8f..000000000000
--- a/dev-java/poi/poi-2.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/poi/poi-2.0.ebuild,v 1.7 2005/02/06 01:06:21 luckyduck Exp $
-
-inherit java-pkg eutils
-
-DESCRIPTION="Java API To Access Microsoft Format Files"
-HOMEPAGE="http://jakarta.apache.org/poi/"
-SRC_URI="mirror://apache/jakarta/poi/release/src/${PN}-src-${PV}-final-20040126.tar.gz"
-IUSE="jikes junit"
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~amd64"
-DEPEND=">=virtual/jdk-1.2
-		>=dev-java/ant-1.4"
-RDEPEND=">=virtual/jdk-1.2
-		dev-java/junit
-		dev-java/xerces
-		dev-java/jdepend
-		dev-java/xalan
-		dev-java/commons-logging
-		dev-java/log4j
-		dev-java/commons-beanutils
-		dev-java/commons-collections
-		dev-java/commons-lang
-		jikes? ( dev-java/jikes )
-		"
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	use jikes && epatch ${FILESDIR}/${P}-jikes-fix.patch
-}
-
-
-src_compile() {
-	local antflags="jar"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	use junit && antflags="${antflags} test"
-	ant ${antflags} || die "compile problem"
-}
-
-src_install() {
-	java-pkg_dojar build/dist/*.jar
-}
diff --git a/dev-java/poi/poi-2.5-r1.ebuild b/dev-java/poi/poi-2.5-r1.ebuild
index 973128d72b46..20abd81ebf72 100644
--- a/dev-java/poi/poi-2.5-r1.ebuild
+++ b/dev-java/poi/poi-2.5-r1.ebuild
@@ -1,39 +1,37 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/poi/poi-2.5-r1.ebuild,v 1.3 2005/02/06 01:06:21 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/poi/poi-2.5-r1.ebuild,v 1.4 2005/05/04 20:27:19 luckyduck Exp $
 
 inherit java-pkg eutils
 
 DESCRIPTION="Java API To Access Microsoft Format Files"
 HOMEPAGE="http://jakarta.apache.org/poi/"
 SRC_URI="mirror://apache/jakarta/poi/release/src/${PN}-src-${PV}-final-20040302.tar.gz"
-IUSE="jikes junit"
+IUSE="jikes"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="x86 ~ppc amd64"
+KEYWORDS="x86 ppc amd64"
 DEPEND=">=virtual/jdk-1.2
-		junit? ( dev-java/junit )
-		sys-apps/sed
-		>=dev-java/ant-1.4
-		jikes? ( dev-java/jikes )"
+	>=dev-java/ant-1.4
+	jikes? ( dev-java/jikes )"
 RDEPEND=">=virtual/jre-1.2
-		>=dev-java/commons-logging-1.0
-		>=dev-java/log4j-1.2.8
-		>=dev-java/commons-beanutils-1.6
-		>=dev-java/commons-collections-2.1
-		>=dev-java/commons-lang-1.0
-		>=dev-java/xerces-2.6.2-r1"
+	>=dev-java/commons-logging-1.0
+	>=dev-java/log4j-1.2.8
+	>=dev-java/commons-beanutils-1.6
+	>=dev-java/commons-collections-2.1
+	>=dev-java/commons-lang-1.0
+	=dev-java/xerces-2.6*"
 S=${WORKDIR}
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 	rm -f src/contrib/lib/*.jar lib/*.jar
-	use jikes && epatch ${FILESDIR}/${P}-jikes-fix.patch
+
+	epatch ${FILESDIR}/${P}-jikes-fix.patch
 	sed -e 's:<target name="init" depends="check-jars,fetch-jars">:<target name="init" depends="check-jars">:' -i build.xml
 
 	cd ${S}/lib
-	use junit && java-pkg_jar-from junit junit.jar junit-3.8.1.jar
 	java-pkg_jar-from log4j log4j.jar log4j-1.2.8.jar
 	java-pkg_jar-from commons-logging commons-logging.jar commons-logging-1.0.1.jar
 	cd ${S}/src/contrib/lib
@@ -47,7 +45,6 @@ src_unpack() {
 src_compile() {
 	local antflags="jar"
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	use junit && antflags="${antflags} test"
 	ant ${antflags} || die "compile problem"
 }