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
commitf07be1469f91d1f0262e033a67c05d12cf9dc975 (patch)
treeb4ab102f85a2be95abbcc72e99dccba2add67bbd /www-servers/tomcat
parentAppended -i m4 to aclocal to fix bug #145903. Thank Didier Link for report. V... (diff)
downloadhistorical-f07be1469f91d1f0262e033a67c05d12cf9dc975.tar.gz
historical-f07be1469f91d1f0262e033a67c05d12cf9dc975.tar.bz2
historical-f07be1469f91d1f0262e033a67c05d12cf9dc975.zip
Take two on ebuild fix
Package-Manager: portage-2.1.1_rc1
Diffstat (limited to 'www-servers/tomcat')
-rw-r--r--www-servers/tomcat/ChangeLog5
-rw-r--r--www-servers/tomcat/Manifest16
-rw-r--r--www-servers/tomcat/tomcat-5.5.17-r2.ebuild6
3 files changed, 15 insertions, 12 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/Manifest b/www-servers/tomcat/Manifest
index 87135ff98bcf..f28bb0ae0043 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -121,14 +121,14 @@ EBUILD tomcat-5.5.17-r1.ebuild 9057 RMD160 24d1a4dec51d3367cc9f882ac7c1729d2d357
MD5 af8ee37a2c1c163778ef2bb1350937c7 tomcat-5.5.17-r1.ebuild 9057
RMD160 24d1a4dec51d3367cc9f882ac7c1729d2d3573ce tomcat-5.5.17-r1.ebuild 9057
SHA256 6a660f7cca4e926ef48d5e32ea4a86d9ed0ac9baf1a011ca5940c8e69d8540b8 tomcat-5.5.17-r1.ebuild 9057
-EBUILD tomcat-5.5.17-r2.ebuild 9773 RMD160 108bc23808df2473b82860503d56bbbac564d1cd SHA1 402b318c1e8be561b293ed6f7fb13f2053bbda52 SHA256 cf0704223709bbf43a24daad1cc53917b37c50f2a95bda09a5566c7bd7cc8733
-MD5 fffeb57c3f546df7885e47e80b785a51 tomcat-5.5.17-r2.ebuild 9773
-RMD160 108bc23808df2473b82860503d56bbbac564d1cd tomcat-5.5.17-r2.ebuild 9773
-SHA256 cf0704223709bbf43a24daad1cc53917b37c50f2a95bda09a5566c7bd7cc8733 tomcat-5.5.17-r2.ebuild 9773
-MISC ChangeLog 21478 RMD160 f73d1ee52c86e5aa36963ee1dbca990cfd6b172b SHA1 07898bd00b3e324574db97fc9d07cd96bcc0cd40 SHA256 859fcad64449f018692807a459c0af4043346e86309159ad792663b5f356a289
-MD5 4416ab466dfa7d14e3bb894b7242bfc3 ChangeLog 21478
-RMD160 f73d1ee52c86e5aa36963ee1dbca990cfd6b172b ChangeLog 21478
-SHA256 859fcad64449f018692807a459c0af4043346e86309159ad792663b5f356a289 ChangeLog 21478
+EBUILD tomcat-5.5.17-r2.ebuild 9784 RMD160 4adabdf5f2d24596e32539333db0c9aa3f231cb8 SHA1 738782a275c672e46836db0541fed3d9bcbe51b7 SHA256 e4890983762a7db9f3575601ab0324b0eb3a6eba73ce55bf06ab883533852cb2
+MD5 60c82299c60006368169e6dc8a57535a tomcat-5.5.17-r2.ebuild 9784
+RMD160 4adabdf5f2d24596e32539333db0c9aa3f231cb8 tomcat-5.5.17-r2.ebuild 9784
+SHA256 e4890983762a7db9f3575601ab0324b0eb3a6eba73ce55bf06ab883533852cb2 tomcat-5.5.17-r2.ebuild 9784
+MISC ChangeLog 21561 RMD160 8ade817d0341576503827738cf95f4f8dcaeeac8 SHA1 0a85035dbc1ecc00f493dc9d798ce52d1d920281 SHA256 08c0a7f59ddd9d6a0afa3ca695eff7051ea5efb621016d38e0e517cb8226dea5
+MD5 de8da1865b04a6e6f323b3475033f0eb ChangeLog 21561
+RMD160 8ade817d0341576503827738cf95f4f8dcaeeac8 ChangeLog 21561
+SHA256 08c0a7f59ddd9d6a0afa3ca695eff7051ea5efb621016d38e0e517cb8226dea5 ChangeLog 21561
MISC metadata.xml 558 RMD160 f81f3d20ca526007bbd8f0f88deffb7a097334ea SHA1 6ab9eadb2a8f19b0d4ea1f02ba88315d49e61fb1 SHA256 d5b4cdcd581677edce5b62c586d618f4c95660127fcb2fb7157f83e6d0e35fce
MD5 e26537a19167254676bb36654dc01f91 metadata.xml 558
RMD160 f81f3d20ca526007bbd8f0f88deffb7a097334ea metadata.xml 558
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