summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Aniszczyk <zx@gentoo.org>2004-05-16 18:37:58 +0000
committerChris Aniszczyk <zx@gentoo.org>2004-05-16 18:37:58 +0000
commit92c3670e71e7bb5ccf3438088eeea1414e8dc877 (patch)
treeebe8a3e9c7c0f6c797659c5ef9c505cbdd98e3ff /dev-java/commons-fileupload
parentMore clean up (Manifest recommit) (diff)
downloadgentoo-2-92c3670e71e7bb5ccf3438088eeea1414e8dc877.tar.gz
gentoo-2-92c3670e71e7bb5ccf3438088eeea1414e8dc877.tar.bz2
gentoo-2-92c3670e71e7bb5ccf3438088eeea1414e8dc877.zip
Closes #49797
Diffstat (limited to 'dev-java/commons-fileupload')
-rw-r--r--dev-java/commons-fileupload/ChangeLog7
-rw-r--r--dev-java/commons-fileupload/commons-fileupload-1.0.ebuild7
-rw-r--r--dev-java/commons-fileupload/files/build.xml.patch6
3 files changed, 14 insertions, 6 deletions
diff --git a/dev-java/commons-fileupload/ChangeLog b/dev-java/commons-fileupload/ChangeLog
index b68eccfc8010..a949d09c057b 100644
--- a/dev-java/commons-fileupload/ChangeLog
+++ b/dev-java/commons-fileupload/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-java/commons-fileupload
# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-fileupload/ChangeLog,v 1.9 2004/05/05 16:42:59 sejo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-fileupload/ChangeLog,v 1.10 2004/05/16 18:37:57 zx Exp $
+
+ 16 May 2004; Chris Aniszczyk <zx@gentoo.org> files/build.xml.patch,
+ commons-fileupload-1.0.ebuild:
+ Docs are now installed if desired. Closes #49797
+ Thanks to Mike Javorski <mike_javorski@bigfoot.com> for the heads up.
05 May 2004; <SeJo@gentoo.org> commons-fileupload-1.0.ebuild:
added ~ppc keyword
diff --git a/dev-java/commons-fileupload/commons-fileupload-1.0.ebuild b/dev-java/commons-fileupload/commons-fileupload-1.0.ebuild
index 46d9a0ac0fa7..3dfc885fc070 100644
--- a/dev-java/commons-fileupload/commons-fileupload-1.0.ebuild
+++ b/dev-java/commons-fileupload/commons-fileupload-1.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-fileupload/commons-fileupload-1.0.ebuild,v 1.6 2004/05/05 16:42:59 sejo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-fileupload/commons-fileupload-1.0.ebuild,v 1.7 2004/05/16 18:37:57 zx Exp $
inherit eutils java-pkg
@@ -28,9 +28,12 @@ src_unpack() {
src_compile() {
local antflags="jar"
use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+ use doc && antflags="${antflags} javadoc"
ant ${antflags} || die "compilation error"
}
src_install() {
- java-pkg_dojar target/${P}.jar
+ mv ${S}/target/${P}.jar ${S}/target/${PN}.jar
+ java-pkg_dojar target/${PN}.jar
+ use doc && dohtml -r dist/docs/
}
diff --git a/dev-java/commons-fileupload/files/build.xml.patch b/dev-java/commons-fileupload/files/build.xml.patch
index 59bc74b9e092..c574b8bbf928 100644
--- a/dev-java/commons-fileupload/files/build.xml.patch
+++ b/dev-java/commons-fileupload/files/build.xml.patch
@@ -1,5 +1,5 @@
---- build.xml 2003-06-26 01:12:13.000000000 -0500
-+++ build.xml.fixed 2004-02-25 18:06:28.836148792 -0500
+--- build.xml 2004-05-16 14:32:30.149792532 -0400
++++ build.xml.updated 2004-05-16 14:32:21.609062656 -0400
@@ -1,159 +1,115 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
@@ -209,7 +209,7 @@
+ <classpath refid="compile.classpath"/>
+ </javac>
+ </target>
-+ <target name="jar" description="o Create the jar" depends="compile">
++ <target name="jar" description="o Create the jar" depends="init,compile">
+ <jar jarfile="target/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
+ </jar>
+ </target>