summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKrzysztof Pawlik <nelchael@gentoo.org>2007-04-28 20:12:31 +0000
committerKrzysztof Pawlik <nelchael@gentoo.org>2007-04-28 20:12:31 +0000
commit679d88cc1721e38b63a17e6d9a8d91dc164d28ee (patch)
treed17cc57a440602f76a4783d1887c0bb688dd3b79 /dev-java/poi
parentFix to work with JAVA_PKG_STRICT. (diff)
downloadgentoo-2-679d88cc1721e38b63a17e6d9a8d91dc164d28ee.tar.gz
gentoo-2-679d88cc1721e38b63a17e6d9a8d91dc164d28ee.tar.bz2
gentoo-2-679d88cc1721e38b63a17e6d9a8d91dc164d28ee.zip
Fix building with Java strict mode.
(Portage version: 2.1.2.5)
Diffstat (limited to 'dev-java/poi')
-rw-r--r--dev-java/poi/ChangeLog5
-rw-r--r--dev-java/poi/poi-2.5.1-r1.ebuild20
2 files changed, 16 insertions, 9 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 <nelchael@gentoo.org> poi-2.5.1-r1.ebuild:
+ Fix building with Java strict mode.
11 Mar 2007; Petteri Räty <betelgeuse@gentoo.org> -poi-2.5.1.ebuild:
Remove generation 1 ebuild.
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}*
}