summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Aniszczyk <zx@gentoo.org>2004-04-05 04:59:48 +0000
committerChris Aniszczyk <zx@gentoo.org>2004-04-05 04:59:48 +0000
commite46c085cd9ed68f5dc285feb0ceae85fac519270 (patch)
tree3ee2a01215c87e639306cc5a9ee85b9d67be96fc /dev-java
parentInitial Import. Closes #46395 (Manifest recommit) (diff)
downloadgentoo-2-e46c085cd9ed68f5dc285feb0ceae85fac519270.tar.gz
gentoo-2-e46c085cd9ed68f5dc285feb0ceae85fac519270.tar.bz2
gentoo-2-e46c085cd9ed68f5dc285feb0ceae85fac519270.zip
Bug fixes. Closes #46205
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/commons-validator/ChangeLog6
-rw-r--r--dev-java/commons-validator/commons-validator-1.0.2-r1.ebuild12
2 files changed, 13 insertions, 5 deletions
diff --git a/dev-java/commons-validator/ChangeLog b/dev-java/commons-validator/ChangeLog
index 088e48eba21b..eb8d91d8e7e2 100644
--- a/dev-java/commons-validator/ChangeLog
+++ b/dev-java/commons-validator/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/commons-validator
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/ChangeLog,v 1.7 2004/03/17 06:34:49 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/ChangeLog,v 1.8 2004/04/05 04:59:48 zx Exp $
+
+ 04 Apr 2004; Chris Aniszczyk <zx@gentoo.org>
+ commons-validator-1.0.2-r1.ebuild:
+ Clean up. Fixes #46205
*commons-validator-1.0.2-r1 (17 Mar 2004)
diff --git a/dev-java/commons-validator/commons-validator-1.0.2-r1.ebuild b/dev-java/commons-validator/commons-validator-1.0.2-r1.ebuild
index 5b111aea5280..aa6a849baa4e 100644
--- a/dev-java/commons-validator/commons-validator-1.0.2-r1.ebuild
+++ b/dev-java/commons-validator/commons-validator-1.0.2-r1.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-validator/commons-validator-1.0.2-r1.ebuild,v 1.1 2004/03/17 06:34:49 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/commons-validator-1.0.2-r1.ebuild,v 1.2 2004/04/05 04:59:48 zx Exp $
inherit java-pkg
@@ -27,14 +27,18 @@ IUSE="doc jikes junit"
S="${WORKDIR}/${P}-src"
-src_compile() {
+src_unpack() {
+ unpack ${A}
+ cd ${S}
echo "oro.jar=`java-config --classpath=oro`" >> build.properties
echo "commons-digester.jar=`java-config --classpath=commons-digester`" >> build.properties
echo "commons-collections.jar=`java-config --classpath=commons-collections`" >> build.properties
- echo "commons-logging.jar=`java-config --classpath=commons-logging`" | sed s/.*:// >> build.properties
+ echo "commons-logging.jar=`java-config --classpath=commons-logging | sed s/.*://`" >> build.properties
echo "commons-beanutils.jar=`java-config --classpath=commons-beanutils`" >> build.properties
echo "xerces.jar=`java-config --classpath=xerces`" >> build.properties
+}
+src_compile() {
local antflags="compile"
use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
use doc && antflags="${antflags} javadoc"
@@ -43,7 +47,7 @@ src_compile() {
}
src_install() {
- #HACK
+ # Dirty hack
mv ${S}/target/conf/MANIFEST.MF ${S}/target/classes/
cd ${S}/target/classes
zip -qr ../${PN}.jar org