Removed unused TOMCAT_HOME variable from 5.0.28 and 5.5.x ebuilds. Also corrected...

Package-Manager: portage-2.1.2_rc3-r1

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index a6fb803887e1fd27fc76c5c24201c9a775314119..9dfe9ff92a6d8303576e91ca91385040e4f5bb91 100644 (file)
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,12 @@
 # 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.87 2006/12/11 22:06:31 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.88 2006/12/13 03:13:45 wltjr Exp $
+
+  13 Dec 2006; William L. Thomson Jr. <wltjr@gentoo.org>
+  tomcat-5.0.28-r14.ebuild, tomcat-5.5.20-r4.ebuild,
+  tomcat-5.5.20-r5.ebuild:
+  Removed unused TOMCAT_HOME variable from 5.0.28 and 5.5.x ebuilds. Also
+  corrected a typo in 5.5.x, all per comments on bug #157956
 
 *tomcat-5.5.20-r5 (11 Dec 2006)
 *tomcat-5.5.20-r4 (11 Dec 2006)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 89e5c022e373a7a33851b753debad7a93b128a31..ff416be5c55c862b8293798ba198f8520905b6f8 100644 (file)
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -114,26 +114,26 @@ EBUILD tomcat-5.0.27-r6.ebuild 3881 RMD160 80b96c74656e19ac148a68a8047b74066e570
 MD5 999b5f8d571956043cde42233459eb5b tomcat-5.0.27-r6.ebuild 3881
 RMD160 80b96c74656e19ac148a68a8047b74066e5709b4 tomcat-5.0.27-r6.ebuild 3881
 SHA256 c750b594d6f7397f4dfa775738db62238391e86c347a3c5bbcc744d8394974ba tomcat-5.0.27-r6.ebuild 3881
-EBUILD tomcat-5.0.28-r14.ebuild 9396 RMD160 266effb829b70d11022216a8d479898d0e9a526c SHA1 d815e80dbd5735741b1f42fb1ff15240af394c0b SHA256 729243dac70cf13b8d27cef8d74d86f6e695cf10e00399d7908d930f5e42671d
-MD5 c4a7c24e9d21a98c54b824bbc37b636f tomcat-5.0.28-r14.ebuild 9396
-RMD160 266effb829b70d11022216a8d479898d0e9a526c tomcat-5.0.28-r14.ebuild 9396
-SHA256 729243dac70cf13b8d27cef8d74d86f6e695cf10e00399d7908d930f5e42671d tomcat-5.0.28-r14.ebuild 9396
-EBUILD tomcat-5.5.20-r4.ebuild 10338 RMD160 c64da2c8095c335d6d5256d900abf59488f76be4 SHA1 051a23ca6d4e1589ab4725a38c64745a930aed8f SHA256 a0e0c8b05314934b33839b1840bfb6b8a7b940fc613afd6bcc80ddfefedc5fa9
-MD5 ae3229bddda65298eefcd432d82e0b3e tomcat-5.5.20-r4.ebuild 10338
-RMD160 c64da2c8095c335d6d5256d900abf59488f76be4 tomcat-5.5.20-r4.ebuild 10338
-SHA256 a0e0c8b05314934b33839b1840bfb6b8a7b940fc613afd6bcc80ddfefedc5fa9 tomcat-5.5.20-r4.ebuild 10338
-EBUILD tomcat-5.5.20-r5.ebuild 10368 RMD160 39cd7884787f7d6899a2005b0fc176bcf8331870 SHA1 c77e2cf38a681f71dad833411dde5378dfc2274f SHA256 0ed7fcc6b2a859d0b021f8c9e9cf30c622c080368d0b2f09faa01a4c1aa1b8b8
-MD5 6f306777765d74e842d0454adefe0049 tomcat-5.5.20-r5.ebuild 10368
-RMD160 39cd7884787f7d6899a2005b0fc176bcf8331870 tomcat-5.5.20-r5.ebuild 10368
-SHA256 0ed7fcc6b2a859d0b021f8c9e9cf30c622c080368d0b2f09faa01a4c1aa1b8b8 tomcat-5.5.20-r5.ebuild 10368
+EBUILD tomcat-5.0.28-r14.ebuild 9357 RMD160 a9a37ab6ec5479ff613eb071548285d62597e183 SHA1 ea258c0c28941ee2e31f7bacdd05657616bf8490 SHA256 a107e5be63f23f54b0664bcc71db4c825683aa18e2a9badfe3cd97805667dcfc
+MD5 0bf6de6439b6a7f67509fe51bedbefab tomcat-5.0.28-r14.ebuild 9357
+RMD160 a9a37ab6ec5479ff613eb071548285d62597e183 tomcat-5.0.28-r14.ebuild 9357
+SHA256 a107e5be63f23f54b0664bcc71db4c825683aa18e2a9badfe3cd97805667dcfc tomcat-5.0.28-r14.ebuild 9357
+EBUILD tomcat-5.5.20-r4.ebuild 10283 RMD160 0e3bb754048993a5fac0e03134d460dfba2158c0 SHA1 72d2a6226bce74da00321bc69e4161b5945228c0 SHA256 e45aab993f811bec6f8808a684b0b1b329f4d1ed91472597f30a84c477381878
+MD5 5df8530f5e6c4f584d72bb55c2367318 tomcat-5.5.20-r4.ebuild 10283
+RMD160 0e3bb754048993a5fac0e03134d460dfba2158c0 tomcat-5.5.20-r4.ebuild 10283
+SHA256 e45aab993f811bec6f8808a684b0b1b329f4d1ed91472597f30a84c477381878 tomcat-5.5.20-r4.ebuild 10283
+EBUILD tomcat-5.5.20-r5.ebuild 10313 RMD160 b94eb10ed54db7fb038469640350069c9ad91dbc SHA1 4784daeaa3d6c68032c3a24179ec060da4ed5159 SHA256 957e3d4502fe7864136643d804a923bcc7ed03b793ee34cecf014c4441a97b4d
+MD5 a5ed201c0985083dd85164054bee3d2c tomcat-5.5.20-r5.ebuild 10313
+RMD160 b94eb10ed54db7fb038469640350069c9ad91dbc tomcat-5.5.20-r5.ebuild 10313
+SHA256 957e3d4502fe7864136643d804a923bcc7ed03b793ee34cecf014c4441a97b4d tomcat-5.5.20-r5.ebuild 10313
 EBUILD tomcat-6.0.4.ebuild 4720 RMD160 0ab9b450fd0f489e4367d964b373dcbaa254a8ce SHA1 4ef1d6d8358ec2c3e1971777e48cc2ee7e79076b SHA256 9c2d60e5fe645033e8b6d001fabc6ebc8c4739853d81e31390bef04933341665
 MD5 5cdab7d864352e90ec3b8ad04087096d tomcat-6.0.4.ebuild 4720
 RMD160 0ab9b450fd0f489e4367d964b373dcbaa254a8ce tomcat-6.0.4.ebuild 4720
 SHA256 9c2d60e5fe645033e8b6d001fabc6ebc8c4739853d81e31390bef04933341665 tomcat-6.0.4.ebuild 4720
-MISC ChangeLog 29575 RMD160 512ae5ed42074cda3d38dc8893037a0025ac65ee SHA1 2025b90c3044fee088e59cf290ea4536193693f5 SHA256 facba04efc815bd258568d7261067ff3809d333e089823b3e2ea33b91a3d27c4
-MD5 8501b90b136c4c7b25ad299ceaf888bf ChangeLog 29575
-RMD160 512ae5ed42074cda3d38dc8893037a0025ac65ee ChangeLog 29575
-SHA256 facba04efc815bd258568d7261067ff3809d333e089823b3e2ea33b91a3d27c4 ChangeLog 29575
+MISC ChangeLog 29848 RMD160 68cde27cef0892ec2f3fa0f1545d435f0ab2fcf5 SHA1 5412eb6e4abf55d721b14cd67f5c2ccc01d33abe SHA256 af51d3489e49a9e6be5d1a067f4c6542e89573990d902efe75bb2938726df530
+MD5 349fd9f0d80e0e60586bf482d4bc9610 ChangeLog 29848
+RMD160 68cde27cef0892ec2f3fa0f1545d435f0ab2fcf5 ChangeLog 29848
+SHA256 af51d3489e49a9e6be5d1a067f4c6542e89573990d902efe75bb2938726df530 ChangeLog 29848
 MISC metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 SHA1 e8dcd8204d0ea02558dd07e1aded5dc58ed1460c SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79
 MD5 0609d3339e0b8d5a3b4707f6b02aad3a metadata.xml 556
 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 metadata.xml 556

diff --git a/www-servers/tomcat/tomcat-5.0.28-r14.ebuild b/www-servers/tomcat/tomcat-5.0.28-r14.ebuild
index c6c6bc125db3e2773fc4e59fe281a27bf2f8a897..ca658f344adf5affda49b416993b9a4c4aa2eb57 100644 (file)
--- a/www-servers/tomcat/tomcat-5.0.28-r14.ebuild
+++ b/www-servers/tomcat/tomcat-5.0.28-r14.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.0.28-r14.ebuild,v 1.4 2006/12/05 00:07:04 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.0.28-r14.ebuild,v 1.5 2006/12/13 03:13:45 wltjr Exp $
 
 inherit eutils java-pkg
 
@@ -44,7 +44,6 @@ IUSE="doc examples source jikes"
 
 S=${WORKDIR}/jakarta-${P}-src
 
-TOMCAT_HOME="/usr/share/${PN}-${SLOT}"
 TOMCAT_NAME="${PN}-${SLOT}"
 WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/webapps"
 

diff --git a/www-servers/tomcat/tomcat-5.5.20-r4.ebuild b/www-servers/tomcat/tomcat-5.5.20-r4.ebuild
index a44a2c871db53ab203de18d817e5b7bf19236202..e2fdbc3512f5f00b377b41b0c6ab6e496b0d34d5 100644 (file)
--- a/www-servers/tomcat/tomcat-5.5.20-r4.ebuild
+++ b/www-servers/tomcat/tomcat-5.5.20-r4.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.20-r4.ebuild,v 1.1 2006/12/11 22:06:32 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.20-r4.ebuild,v 1.2 2006/12/13 03:13:45 wltjr Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -56,7 +56,6 @@ fi
 
 S=${WORKDIR}/${MY_P}
 
-TOMCAT_HOME="/usr/share/${PN}-${SLOT}"
 TOMCAT_NAME="${PN}-${SLOT}"
 WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/webapps"
 
@@ -192,7 +191,7 @@ src_install() {
        keepdir ${CATALINA_BASE}/shared/lib
        keepdir ${CATALINA_BASE}/shared/classes
 
-       keepdir /usr/share/${TOMCAT_NAME}/${CATALIA_HOME}/common/lib
+       keepdir /usr/share/${TOMCAT_NAME}/common/lib
 
        dodir   /etc/${TOMCAT_NAME}
        fperms  750 /etc/${TOMCAT_NAME}

diff --git a/www-servers/tomcat/tomcat-5.5.20-r5.ebuild b/www-servers/tomcat/tomcat-5.5.20-r5.ebuild
index 16ac41300fd80aa9f985a7c782b065d85059534e..ab52ff1036dcff5a59f77be88fc77c747b298e85 100644 (file)
--- a/www-servers/tomcat/tomcat-5.5.20-r5.ebuild
+++ b/www-servers/tomcat/tomcat-5.5.20-r5.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.20-r5.ebuild,v 1.1 2006/12/11 22:06:32 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.20-r5.ebuild,v 1.2 2006/12/13 03:13:45 wltjr Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -56,7 +56,6 @@ fi
 
 S=${WORKDIR}/${MY_P}
 
-TOMCAT_HOME="/usr/share/${PN}-${SLOT}"
 TOMCAT_NAME="${PN}-${SLOT}"
 WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/webapps"
 
@@ -192,7 +191,7 @@ src_install() {
        keepdir ${CATALINA_BASE}/shared/lib
        keepdir ${CATALINA_BASE}/shared/classes
 
-       keepdir /usr/share/${TOMCAT_NAME}/${CATALIA_HOME}/common/lib
+       keepdir /usr/share/${TOMCAT_NAME}/common/lib
 
        dodir   /etc/${TOMCAT_NAME}
        fperms  750 /etc/${TOMCAT_NAME}