summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Thomson <wltjr@gentoo.org>2006-09-04 16:49:36 +0000
committerWilliam Thomson <wltjr@gentoo.org>2006-09-04 16:49:36 +0000
commit71d74bed27be3f124ccf6547e79b2e085626e0c6 (patch)
tree100e6aa8f361393e48d2baf23d570fcc947b9461 /www-servers/tomcat
parentAppended -i m4 to aclocal to fix bug #145903. Thank Didier Link for report. V... (diff)
downloadgentoo-2-71d74bed27be3f124ccf6547e79b2e085626e0c6.tar.gz
gentoo-2-71d74bed27be3f124ccf6547e79b2e085626e0c6.tar.bz2
gentoo-2-71d74bed27be3f124ccf6547e79b2e085626e0c6.zip
Take two on ebuild fix
(Portage version: 2.1.1_rc1)
Diffstat (limited to 'www-servers/tomcat')
-rw-r--r--www-servers/tomcat/ChangeLog5
-rw-r--r--www-servers/tomcat/tomcat-5.5.17-r2.ebuild6
2 files changed, 7 insertions, 4 deletions
diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index e92e1477621f..0cf580298620 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for www-servers/tomcat
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.55 2006/09/04 16:24:12 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.56 2006/09/04 16:49:36 wltjr Exp $
+
+ 04 Sep 2006; <wlt@gentoo.org> tomcat-5.5.17-r2.ebuild:
+ Take two on ebuild fix
04 Sep 2006; <wlt@gentoo.org> ChangeLog:
Manifest did not get committed
diff --git a/www-servers/tomcat/tomcat-5.5.17-r2.ebuild b/www-servers/tomcat/tomcat-5.5.17-r2.ebuild
index 45134b4c6b0f..ac5398e8443e 100644
--- a/www-servers/tomcat/tomcat-5.5.17-r2.ebuild
+++ b/www-servers/tomcat/tomcat-5.5.17-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.17-r2.ebuild,v 1.2 2006/09/04 16:19:52 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.17-r2.ebuild,v 1.3 2006/09/04 16:49:36 wltjr Exp $
inherit eutils java-pkg-2 java-ant-2
@@ -69,7 +69,7 @@ pkg_setup() {
fi
}
-ant_src_unpack() {
+src_unpack() {
unpack ${A}
cd ${S}
@@ -109,7 +109,7 @@ ant_src_unpack() {
java-pkg_jar-from xerces-2 xercesImpl.jar
fi
- mkdir ${S}/build/build/lib && cd ${S}/build/buildlib
+ mkdir ${S}/build/build/common/lib && cd ${S}/build/build/common/lib
java-pkg_jar-from ant-core
java-pkg_jar-from commons-collections
java-pkg_jar-from commons-dbcp