summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlistair Bush <ali_bush@gentoo.org>2007-04-22 01:35:12 +0000
committerAlistair Bush <ali_bush@gentoo.org>2007-04-22 01:35:12 +0000
commit61c2fe3dd5598964ac97abba1b92290263f62371 (patch)
tree87d31ebc19bbf5eb0d929e778435ad5920fb68fc
parentStable on Alpha, bug 174909. (diff)
downloadgentoo-2-61c2fe3dd5598964ac97abba1b92290263f62371.tar.gz
gentoo-2-61c2fe3dd5598964ac97abba1b92290263f62371.tar.bz2
gentoo-2-61c2fe3dd5598964ac97abba1b92290263f62371.zip
Fixing javadoc unpack error
(Portage version: 2.1.2.4)
-rw-r--r--dev-java/ehcache/ChangeLog6
-rw-r--r--dev-java/ehcache/ehcache-1.2.4-r2.ebuild9
2 files changed, 12 insertions, 3 deletions
diff --git a/dev-java/ehcache/ChangeLog b/dev-java/ehcache/ChangeLog
index c6085b010c9a..5e5b2a40fa81 100644
--- a/dev-java/ehcache/ChangeLog
+++ b/dev-java/ehcache/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/ehcache
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ehcache/ChangeLog,v 1.8 2007/04/19 19:10:37 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ehcache/ChangeLog,v 1.9 2007/04/22 01:35:12 ali_bush Exp $
+
+ 22 Apr 2007; Alistair John Bush <ali_bush@gentoo.org>
+ ehcache-1.2.4-r2.ebuild:
+ Fixed build error when using doc use flag
19 Apr 2007; Krzysiek Pawlik <nelchael@gentoo.org>
+files/build.xml-1.2.4-r2, ehcache-1.2.4-r2.ebuild:
diff --git a/dev-java/ehcache/ehcache-1.2.4-r2.ebuild b/dev-java/ehcache/ehcache-1.2.4-r2.ebuild
index 683a7d9ad929..362f7a645fda 100644
--- a/dev-java/ehcache/ehcache-1.2.4-r2.ebuild
+++ b/dev-java/ehcache/ehcache-1.2.4-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ehcache/ehcache-1.2.4-r2.ebuild,v 1.2 2007/04/19 19:10:37 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ehcache/ehcache-1.2.4-r2.ebuild,v 1.3 2007/04/22 01:35:12 ali_bush Exp $
JAVA_PKG_IUSE="doc source"
@@ -23,6 +23,7 @@ RDEPEND=">=virtual/jre-1.5
${COMMON_DEPEND}"
DEPEND=">=virtual/jdk-1.5
${COMMON_DEPEND}
+ app-arch/unzip
source? ( app-arch/zip )
>=dev-java/ant-core-1.5"
@@ -34,7 +35,7 @@ src_unpack() {
unpack ${A}
cd ${S}
- use doc && unpack ${P}-javadoc.zip
+ use doc && unzip -qq ${P}-javadoc.zip
mkdir src && cd src
unzip -qq ../${P}-sources.jar
@@ -56,6 +57,10 @@ src_unpack() {
}
+src_compile() {
+ eant jar
+}
+
src_install() {
java-pkg_dojar ${PN}.jar