diff options
| author |   Jan Brinkmann <luckyduck@gentoo.org> | 2005-05-20 14:50:45 +0000 |
|---|---|---|
| committer | Jan Brinkmann <luckyduck@gentoo.org> | 2005-05-20 14:50:45 +0000 |
| commit | 0d1fff31329372dca2f6d9ae18ed412a547580e8 (patch) | |
| tree | 72c2181d409361b13a423521eb0d8bfa98bd9928 /www-servers | |
| parent | fix gtk dep (diff) | |
| download | gentoo-2-0d1fff31329372dca2f6d9ae18ed412a547580e8.tar.gz gentoo-2-0d1fff31329372dca2f6d9ae18ed412a547580e8.tar.bz2 gentoo-2-0d1fff31329372dca2f6d9ae18ed412a547580e8.zip | |
fixed problems with first time installation, see #93322
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'www-servers')
| -rw-r--r-- | www-servers/tomcat/ChangeLog | 5 | ||||
| -rw-r--r-- | www-servers/tomcat/Manifest | 14 | ||||
| -rw-r--r-- | www-servers/tomcat/tomcat-5.0.28-r4.ebuild | 14 |
3 files changed, 12 insertions, 21 deletions
diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog index e042ccf55daf..a4eb58d33ff1 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.33 2005/05/17 20:58:29 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.34 2005/05/20 14:50:45 luckyduck Exp $ + + 20 May 2005; Jan Brinkmann <luckyduck@gentoo.org> tomcat-5.0.28-r4.ebuild: + fixed problems with first time installation, see #93322 17 May 2005; Jan Brinkmann <luckyduck@gentoo.org> tomcat-5.0.28-r4.ebuild: further fixes & cleanups / improvements, thanks axxo :-) diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index 3b9f34bccb3b..b697fd53d4d1 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -1,9 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 918871e43d382090d5e2ee937cad8271 tomcat-5.0.27-r6.ebuild 3931 -MD5 c558c6998b79975fd96616fa592456a1 tomcat-5.0.28-r4.ebuild 9624 -MD5 665a3e03d80a771d819f0da7e08d104d ChangeLog 16687 +MD5 ee8f64e84d8adfbe00daf8ffe9ce63df tomcat-5.0.28-r4.ebuild 9630 +MD5 fee071cb7ddac4955b8e40959768ff19 ChangeLog 16823 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 @@ -20,10 +17,3 @@ MD5 d538c7caef4b5cecd6cc95ee1988bace files/5.0.28/tomcat.conf 2652 MD5 c0d89ffb4276e8a6d0cf08fcad6517f9 files/5.0.28/tomcat.init 701 MD5 744a9ce174144fc5689c1fabee527e55 files/5.0.28/build.xml-02.patch 3177 MD5 98a29b32de00d97f156dc31dfe3cf472 files/5.0.28/jikes.diff 584 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.0 (GNU/Linux) - -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 5f8927a23948..fc25ab2438b3 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.2 2005/05/17 20:58:29 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.0.28-r4.ebuild,v 1.3 2005/05/20 14:50:45 luckyduck Exp $ inherit eutils java-pkg @@ -87,6 +87,7 @@ src_unpack() { src_compile(){ local antflags="-Dbase.path=${T}" use jikes && antflags="${antflags} -Dbuild.compiler=jikes" + antflags="${antflags} -Dactivation.jar=$(java-config -p sun-jaf-bin)" antflags="${antflags} -Dcommons-collections.jar=$(java-config -p commons-collections)" antflags="${antflags} -Dcommons-daemon.jar=$(java-config -p commons-daemon)" @@ -111,13 +112,16 @@ src_compile(){ antflags="${antflags} -Dsaxpath.jar=$(java-pkg_getjar saxpath saxpath.jar)" antflags="${antflags} -DxercesImpl.jar=$(java-pkg_getjar xerces-2 xercesImpl.jar)" antflags="${antflags} -Dxml-apis.jar=$(java-pkg_getjar xerces-2 xml-apis.jar)" - antflags="${antflags} -Dstruts.home=/usr/share/struts" ant ${antflags} || die "compile failed" } src_install() { + # new user for tomcat + enewgroup tomcat + enewuser tomcat -1 -1 /dev/null tomcat + cd ${S}/jakarta-tomcat-5/build # init.d, env.d, conf.d @@ -215,12 +219,6 @@ src_install() { fperms 640 /etc/${TOMCAT_NAME}/default/tomcat-users.xml } - -pkg_preinst() { - enewgroup tomcat - enewuser tomcat -1 -1 /dev/null tomcat -} - pkg_postinst() { #due to previous ebuild bloopers, make sure everything is correct chown root:root /etc/init.d/${TOMCAT_NAME} |