summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2008-01-07 16:30:56 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2008-01-07 16:30:56 +0000
commit522622fbb81786b4d8f26ae512047d4afe898121 (patch)
tree7bd88f1839dd32c0802b99f54952e91f81c71c44 /dev-java/jcs
parentFlip -sparc back to ~sparc wrt #189143 and fix quoting. (diff)
downloadgentoo-2-522622fbb81786b4d8f26ae512047d4afe898121.tar.gz
gentoo-2-522622fbb81786b4d8f26ae512047d4afe898121.tar.bz2
gentoo-2-522622fbb81786b4d8f26ae512047d4afe898121.zip
Fix javadoc generation. Reported in bug #204646.
(Portage version: 2.1.4_rc14)
Diffstat (limited to 'dev-java/jcs')
-rw-r--r--dev-java/jcs/ChangeLog6
-rw-r--r--dev-java/jcs/files/build-1.3.xml4
-rw-r--r--dev-java/jcs/jcs-1.3.ebuild6
3 files changed, 7 insertions, 9 deletions
diff --git a/dev-java/jcs/ChangeLog b/dev-java/jcs/ChangeLog
index 3ff38408d9f0..8494a150ddfe 100644
--- a/dev-java/jcs/ChangeLog
+++ b/dev-java/jcs/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/jcs
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jcs/ChangeLog,v 1.13 2008/01/06 21:43:54 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jcs/ChangeLog,v 1.14 2008/01/07 16:30:55 betelgeuse Exp $
+
+ 07 Jan 2008; Petteri Räty <betelgeuse@gentoo.org> files/build-1.3.xml,
+ jcs-1.3.ebuild:
+ Fix javadoc generation. Reported in bug #204646.
06 Jan 2008; Petteri Räty <betelgeuse@gentoo.org> jcs-1.3.ebuild:
Use JAVA_PKG_IUSE.
diff --git a/dev-java/jcs/files/build-1.3.xml b/dev-java/jcs/files/build-1.3.xml
index f3623a42de76..c7b94bf6371c 100644
--- a/dev-java/jcs/files/build-1.3.xml
+++ b/dev-java/jcs/files/build-1.3.xml
@@ -29,9 +29,7 @@
</jar>
</target>
<target name="javadoc" depends="compile">
- <javadoc destdir="${dist}/doc/api">
- <fileset dir="${src}"/>
- </javadoc>
+ <javadoc destdir="${dist}/doc/api" sourcepath="${src}" />
</target>
<target name="clean">
<delete dir="${build}"/>
diff --git a/dev-java/jcs/jcs-1.3.ebuild b/dev-java/jcs/jcs-1.3.ebuild
index d0e89f283dd6..7124b7107716 100644
--- a/dev-java/jcs/jcs-1.3.ebuild
+++ b/dev-java/jcs/jcs-1.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jcs/jcs-1.3.ebuild,v 1.2 2008/01/06 21:43:54 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jcs/jcs-1.3.ebuild,v 1.3 2008/01/07 16:30:55 betelgeuse Exp $
JAVA_PKG_IUSE="doc source"
@@ -42,10 +42,6 @@ src_unpack() {
if use admin; then
LIBRARY_PKGS="${LIBRARY_PKGS},velocity"
else
- ewarn
- ewarn "JCS Admin is disabled, if you want it hit Ctrl-C and add"
- ewarn "\"admin\" USE flag."
- ewarn
rm -fr "${S}/src/java/org/apache/jcs/admin"
fi