From 67b812524b5c8895969c7c1bc3ae1928e4d133a8 Mon Sep 17 00:00:00 2001 From: Krzysztof Pawlik Date: Sat, 28 Apr 2007 20:12:31 +0000 Subject: [PATCH] Fix building with Java strict mode. Package-Manager: portage-2.1.2.5 --- dev-java/poi/ChangeLog | 5 ++++- dev-java/poi/Manifest | 24 ++++++++++++------------ dev-java/poi/poi-2.5.1-r1.ebuild | 20 ++++++++++++-------- 3 files changed, 28 insertions(+), 21 deletions(-) diff --git a/dev-java/poi/ChangeLog b/dev-java/poi/ChangeLog index 5ed001db8fd1..a4aa6006f067 100644 --- a/dev-java/poi/ChangeLog +++ b/dev-java/poi/ChangeLog @@ -1,6 +1,9 @@ # 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.26 2007/03/11 21:44:42 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/poi/ChangeLog,v 1.27 2007/04/28 20:12:31 nelchael Exp $ + + 28 Apr 2007; Krzysiek Pawlik poi-2.5.1-r1.ebuild: + Fix building with Java strict mode. 11 Mar 2007; Petteri Räty -poi-2.5.1.ebuild: Remove generation 1 ebuild. diff --git a/dev-java/poi/Manifest b/dev-java/poi/Manifest index 30e0c2b7edf4..fd1076765544 100644 --- a/dev-java/poi/Manifest +++ b/dev-java/poi/Manifest @@ -6,14 +6,14 @@ MD5 bf71154ca919a88d8c12da29e33ef4d9 files/poi-2.5-jikes-fix.patch 1190 RMD160 f7cf0f41d37e6010edd5ca081f0a7566862991bb files/poi-2.5-jikes-fix.patch 1190 SHA256 a786c5d718e3b934101607eeb7c76c2a5b5d8e245cde9e502d14cfecfc85bcf4 files/poi-2.5-jikes-fix.patch 1190 DIST poi-src-2.5.1-final-20040804.tar.gz 6870414 RMD160 47707ec7db9cb5b2650d6eddaf0f351fee3237f5 SHA1 3d7f211e47f58007c3d0bcf891adba33d25482d5 SHA256 783c6c36b9762aafd3386adcfbe71ad46aaa14d9fe20545c4a60eb591cfe0cc1 -EBUILD poi-2.5.1-r1.ebuild 1579 RMD160 0c40ca94dc40af62c735b1ffb05f1e5c90f18b59 SHA1 17454bfe1fac64331fe4920196b0cd3a140afcb4 SHA256 b7e6a9429bfc23be28902b6d497676fb94a16d2792636afce054d00819d0086a -MD5 3b43cb1fda0dae57ec017eda479afc7b poi-2.5.1-r1.ebuild 1579 -RMD160 0c40ca94dc40af62c735b1ffb05f1e5c90f18b59 poi-2.5.1-r1.ebuild 1579 -SHA256 b7e6a9429bfc23be28902b6d497676fb94a16d2792636afce054d00819d0086a poi-2.5.1-r1.ebuild 1579 -MISC ChangeLog 3667 RMD160 77ded8ec3679b9ff772c9ac6bcddf52b7b2fea19 SHA1 67ff7010ea4afdfb870d6c8792f32b92584fd698 SHA256 bf00d08bad28286a5a307b14cf4a7524ebeb77e34b165e6c5c756fbb54fe5e22 -MD5 4f51b590d5af9d57c1016c50f61c425e ChangeLog 3667 -RMD160 77ded8ec3679b9ff772c9ac6bcddf52b7b2fea19 ChangeLog 3667 -SHA256 bf00d08bad28286a5a307b14cf4a7524ebeb77e34b165e6c5c756fbb54fe5e22 ChangeLog 3667 +EBUILD poi-2.5.1-r1.ebuild 1624 RMD160 3f7f4af6ad9f1a41bc413c0dce075601e2496689 SHA1 9272b615965d4e76a80a8d6bcde4e7877e7c9403 SHA256 f16f5b758d6a37c1b406587223a98f4ccb84417b8e537aa08eb082c16514595d +MD5 c15dde6871548a1df7d54e18d4699153 poi-2.5.1-r1.ebuild 1624 +RMD160 3f7f4af6ad9f1a41bc413c0dce075601e2496689 poi-2.5.1-r1.ebuild 1624 +SHA256 f16f5b758d6a37c1b406587223a98f4ccb84417b8e537aa08eb082c16514595d poi-2.5.1-r1.ebuild 1624 +MISC ChangeLog 3778 RMD160 75ffe7159a14906de6eabc96789c8f41fe786973 SHA1 919e109ece9f9eb2e4c243a0f067831ce08f9759 SHA256 4b39c21c2eacf6f4838da4a5dd2ed58a81816027e08eb7e641839acba906122d +MD5 5a6aaef1155066cc7e1daa5ee9a5a320 ChangeLog 3778 +RMD160 75ffe7159a14906de6eabc96789c8f41fe786973 ChangeLog 3778 +SHA256 4b39c21c2eacf6f4838da4a5dd2ed58a81816027e08eb7e641839acba906122d ChangeLog 3778 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157 @@ -22,9 +22,9 @@ MD5 dc268d3c0bfdbd437b92674b5acb87fc files/digest-poi-2.5.1-r1 289 RMD160 26e2aefebb6a47a977170b40c36d4200fd959b11 files/digest-poi-2.5.1-r1 289 SHA256 f35e533477f27bb7a77aa9cee9a58abbc90eafddd334b0b1364237733110ec44 files/digest-poi-2.5.1-r1 289 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.2 (GNU/Linux) +Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFF9HhMcxLzpIGCsLQRAmiqAJ4s/uNsQOKNdEcotU+v8+855HaI9ACcDEp/ -Jqxx8r9R4fxN7d5mmh8MKLQ= -=iCNi +iD8DBQFGM6rlgo/w9rxVVVERAoGyAKCdD3IEoaIhahOeN85VxdkpxlCjigCfV044 +EJEg8/MulQbwRnrfaRLsI6A= +=Hsit -----END PGP SIGNATURE----- diff --git a/dev-java/poi/poi-2.5.1-r1.ebuild b/dev-java/poi/poi-2.5.1-r1.ebuild index b99711e62bb1..599332aa473d 100644 --- a/dev-java/poi/poi-2.5.1-r1.ebuild +++ b/dev-java/poi/poi-2.5.1-r1.ebuild @@ -1,6 +1,8 @@ # 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-2.5.1-r1.ebuild,v 1.6 2007/03/11 21:42:02 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/poi/poi-2.5.1-r1.ebuild,v 1.7 2007/04/28 20:12:31 nelchael Exp $ + +JAVA_PKG_IUSE="doc source" inherit eutils java-pkg-2 java-ant-2 @@ -11,20 +13,21 @@ SRC_URI="mirror://apache/jakarta/poi/release/src/${PN}-src-${PV}-final-20040804. LICENSE="Apache-2.0" SLOT="0" KEYWORDS="amd64 ppc ppc64 x86" -IUSE="doc source" +IUSE="" -RDEPEND=">=virtual/jre-1.4 - dev-java/xalan +COMMON_DEP="dev-java/xalan >=dev-java/commons-logging-1.0 >=dev-java/log4j-1.2.8 =dev-java/commons-beanutils-1.6* =dev-java/commons-lang-2.0* dev-java/junit" + +RDEPEND=">=virtual/jre-1.4 + ${COMMON_DEP}" DEPEND=">=virtual/jdk-1.4 - ${RDEPEND} - >=dev-java/ant-core-1.4" + ${COMMON_DEP}" -S=${WORKDIR} +S="${WORKDIR}" src_unpack() { unpack ${A} @@ -45,11 +48,12 @@ src_compile() { } src_install() { + # Contains not only javadocs: use doc && java-pkg_dohtml -r docs/* use source && java-pkg_dosrc src/contrib/src/org src/java/org/ src/scratchpad/src/org cd build/dist/ java-pkg_newjar poi-scratchpad-${PV}* ${PN}-scratchpad.jar java-pkg_newjar poi-contrib-${PV}* ${PN}-contrib.jar - java-pkg_newjar poi-${PV}* ${PN}.jar + java-pkg_newjar poi-${PV}* } -- 2.26.2