summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Brinkmann <luckyduck@gentoo.org>2005-05-17 20:58:29 +0000
committerJan Brinkmann <luckyduck@gentoo.org>2005-05-17 20:58:29 +0000
commit14928173e56f9226093053e6199e33deffef89a7 (patch)
tree5f54f7013d29205fee40aa67aff1f42434189b96 /www-servers
parentadded crypt useflag (diff)
downloadhistorical-14928173e56f9226093053e6199e33deffef89a7.tar.gz
historical-14928173e56f9226093053e6199e33deffef89a7.tar.bz2
historical-14928173e56f9226093053e6199e33deffef89a7.zip
further fixes & cleanups / improvements, thanks axxo :-)
Package-Manager: portage-2.0.51.22
Diffstat (limited to 'www-servers')
-rw-r--r--www-servers/tomcat/ChangeLog5
-rw-r--r--www-servers/tomcat/Manifest10
-rw-r--r--www-servers/tomcat/tomcat-5.0.28-r4.ebuild10
3 files changed, 15 insertions, 10 deletions
diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 0dfeff057389..e042ccf55daf 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for www-servers/tomcat
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.32 2005/05/17 19:19:18 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.33 2005/05/17 20:58:29 luckyduck Exp $
+
+ 17 May 2005; Jan Brinkmann <luckyduck@gentoo.org> tomcat-5.0.28-r4.ebuild:
+ further fixes & cleanups / improvements, thanks axxo :-)
*tomcat-5.0.28-r4 (17 May 2005)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index cf0daf90c183..3b9f34bccb3b 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -2,8 +2,8 @@
Hash: SHA1
MD5 918871e43d382090d5e2ee937cad8271 tomcat-5.0.27-r6.ebuild 3931
-MD5 d1cc183edc31bb005ee1213809998eb6 tomcat-5.0.28-r4.ebuild 9573
-MD5 1dd85c5b5e970431883086c6aeed5100 ChangeLog 16550
+MD5 c558c6998b79975fd96616fa592456a1 tomcat-5.0.28-r4.ebuild 9624
+MD5 665a3e03d80a771d819f0da7e08d104d ChangeLog 16687
MD5 c11ce937193406815ff7a2b306784fd8 metadata.xml 555
MD5 d5a48abc8db5543a73abbbf151d0630e files/digest-tomcat-5.0.27-r6 75
MD5 af26ca4772989a2090085a6e24b71628 files/digest-tomcat-5.0.28-r4 78
@@ -23,7 +23,7 @@ MD5 98a29b32de00d97f156dc31dfe3cf472 files/5.0.28/jikes.diff 584
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
-iD8DBQFCikPM06ebR+OMO78RAtlUAJ47Xzkp0315OmX/AcTTsG0EXnSbUwCeOiF9
-gRy6M5LyIGNr+vDk4KvcLS8=
-=lJmL
+iD8DBQFCilsS06ebR+OMO78RAlLWAJ9Sd+SWXAUm015dDfTJZIEYn9hjNwCfYM+r
+x853Nvc1WlQsm7FT23YyXxk=
+=ec/L
-----END PGP SIGNATURE-----
diff --git a/www-servers/tomcat/tomcat-5.0.28-r4.ebuild b/www-servers/tomcat/tomcat-5.0.28-r4.ebuild
index b262cf259e44..5f8927a23948 100644
--- a/www-servers/tomcat/tomcat-5.0.28-r4.ebuild
+++ b/www-servers/tomcat/tomcat-5.0.28-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.0.28-r4.ebuild,v 1.1 2005/05/17 19:19:18 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.0.28-r4.ebuild,v 1.2 2005/05/17 20:58:29 luckyduck Exp $
inherit eutils java-pkg
@@ -47,8 +47,8 @@ TOMCAT_NAME="${PN}-${SLOT}"
src_unpack() {
unpack ${A}
-
cd ${S}
+
epatch ${FILESDIR}/${PV}/build.xml-01.patch
epatch ${FILESDIR}/${PV}/build.xml-02.patch
epatch ${FILESDIR}/${PV}/gentoo.diff
@@ -191,8 +191,10 @@ src_install() {
sed -e s:SHUTDOWN:${randpw}: -i conf/{server,server-minimal}.xml
# copy over the directories
- cp -pra conf/* ${D}/etc/${TOMCAT_NAME}/default || die "failed to copy conf"
- cp -pra bin common server shared ${D}/usr/share/${TOMCAT_NAME} || die "failed to copy"
+ chmod -R 750 conf/*
+ chown -R tomcat:tomcat webapps/*
+ cp -R conf/* ${D}/etc/${TOMCAT_NAME}/default || die "failed to copy conf"
+ cp -R bin common server shared ${D}/usr/share/${TOMCAT_NAME} || die "failed to copy"
# if the useflag is set, copy over the examples
dodir /var/lib/${TOMCAT_NAME}/default/webapps