www-servers/tomcat: fixed bug #350645

Package-Manager: portage-2.1.9.33/cvs/Linux x86_64

6 files changed, 31 insertions, 15 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 722b189b7b9c..b14b176959f8 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for www-servers/tomcat
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.234 2010/12/21 09:13:39 ali_bush Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.235 2011/01/18 18:02:20 fordfrog Exp $
+
+*tomcat-7.0.5-r1 (18 Jan 2011)
+*tomcat-6.0.29-r1 (18 Jan 2011)
+*tomcat-6.0.28-r1 (18 Jan 2011)
+*tomcat-6.0.26-r2 (18 Jan 2011)
+
+  18 Jan 2011; Miroslav Šulc <fordfrog@gentoo.org> -tomcat-6.0.26-r1.ebuild,
+  +tomcat-6.0.26-r2.ebuild, -tomcat-6.0.28.ebuild, +tomcat-6.0.28-r1.ebuild,
+  -tomcat-6.0.29.ebuild, +tomcat-6.0.29-r1.ebuild, -tomcat-7.0.5.ebuild,
+  +tomcat-7.0.5-r1.ebuild:
+  Fixed bug #350645 in all versions except 5.5.27 where it does not seem to
+  occur, thanks to gentoo@ddrs.ath.cx pointing it out and for the fix
 
 *tomcat-7.0.5 (21 Dec 2010)
 
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 4f2e061826b7..bb1ba065b038 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -21,10 +21,10 @@ DIST apache-tomcat-6.0.28-src.tar.gz 3325872 RMD160 4a699324f332b8c32fa79615f146
 DIST apache-tomcat-6.0.29-src.tar.gz 3330475 RMD160 eb789c63aaf629ec897b4280924e086c969169f6 SHA1 255e080706578be0b0f15c67989718ab94e52837 SHA256 9746483edb46b112a81b57376701c7c23c5c657675c2c7efa3187447c07b9d28
 DIST apache-tomcat-7.0.5-src.tar.gz 3790790 RMD160 c09630d499c2bc3e5dfa69b8ff345f53e969a811 SHA1 e69524cca265a34c1abf7c8d53dd52622e22299d SHA256 f289474b8deb869682f5f8fad4355600caa99d779b4414917401ab9a647ee737
 EBUILD tomcat-5.5.27-r4.ebuild 10058 RMD160 a235794b1e53760c35289566dcaff2446437f53d SHA1 a49fb2db00fbcab78ab8672cdb11a8b0404df671 SHA256 18b69fb66c088a621db636243823701504af0a1dcc16df378e018f1958ecfa01
-EBUILD tomcat-6.0.26-r1.ebuild 6870 RMD160 159eb416c53876cc18d72937f901edcd2e6e8c92 SHA1 618e876b15ee3f55c6e79d474f41a603cf2f9ec8 SHA256 c9bc6777a9d5a0112c1a0e2c77b5e8f8316bfff2043af7fc3e5880102428c400
+EBUILD tomcat-6.0.26-r2.ebuild 6913 RMD160 bdf0aba8f686216106286f7210823387699e1960 SHA1 75ea1850ed3d9f2ab7a2194cefa022e0652e286a SHA256 33fe5868df3c1eb86983fc9c220629947b2ec0538f7467aaafa14ed1571a14a2
 EBUILD tomcat-6.0.26.ebuild 6861 RMD160 38045bfd3921e366823b00061ee327fb17d21bbf SHA1 272759bcbf4744ec404e6c941c2aeac3852c58e8 SHA256 1d8198ae22485ffb11a87690f969f272c6446c3a83b4137bc14b7f1f8a62cba2
-EBUILD tomcat-6.0.28.ebuild 6906 RMD160 8c8796c768eebdf7e875724be616ef2a8c9118f3 SHA1 cacc13108cb6e91de6877947d14415e9e5e78e48 SHA256 026f1710b56bca990a43512b00d187821981a0064510564000647a3101d393c6
-EBUILD tomcat-6.0.29.ebuild 6904 RMD160 93951b98e77724fdbf4d4a1aa500a6ce203bebcc SHA1 aa3d6ac0680a6567f3ab0e32ffd10143ccfff99e SHA256 c3339a61b466e4094abb9d925c1b86e489f29e88f10f7cba4ae7dedda3adfec1
-EBUILD tomcat-7.0.5.ebuild 7053 RMD160 b118af249385d654e8b4d03b5ce7014db5e11c68 SHA1 7b57023dc030a01526cf3ff0ff5cdae7eb5394e9 SHA256 82a6d9f9fa6422c17c31a0a636852fed9f23d10a626d01aa92fc4a19510421c6
-MISC ChangeLog 60260 RMD160 bee32cbcaa82596f103aa25596d92fd3871a078b SHA1 fd477247764181fb2a55d585514f5613fa6f7067 SHA256 2ee51754731c5980409dd32da1d51a048b12f7d3285ca07f76f944c4fec91482
+EBUILD tomcat-6.0.28-r1.ebuild 6948 RMD160 dcc281587e6a2bd0dd81808e1fa5d1a4c5a3a7f7 SHA1 57ef17a33196a95e7581cdc6fcba3ba38679da57 SHA256 7af5502722afe40b4e54e4306598b9c86197ef0304022791ac96dbcfc3dbec9e
+EBUILD tomcat-6.0.29-r1.ebuild 6948 RMD160 d340dad22a80e36a03bdc0614fee97ce9e296fe2 SHA1 4885f884254f2475a6ca004e82dcfeed9462de7b SHA256 a6f9cba93f8f07fd184b62ac7aa2830b7d420050c08e13a060db54c77c730e7f
+EBUILD tomcat-7.0.5-r1.ebuild 7097 RMD160 9c17268799c3e6f36d30985b7f2757e51658aef2 SHA1 afcb2863df4d9b8066dd831b77b253e19f6e9a72 SHA256 0e60ee536b32d0721b6128194d24fec08bb2bcb9e58a2bd941e017b45e8712f3
+MISC ChangeLog 60790 RMD160 2c30e2786bfb3405643e8b65f7cc0af8eef79e2d SHA1 c28e1da666767c7bd84f50ad242a8404bf757697 SHA256 8856180a35c5c65f6ed8d4f055b7c5e77e6af2f9cb84f2086a8c95aebead9700
 MISC metadata.xml 658 RMD160 db94c7bc6ba622acfe88f970aa7d2e6fa1718a2a SHA1 aa25178fefb68df9dee7d8fc0d925a2fbbb655dd SHA256 5ddc2743ca9e3ec0bef7983248a9c8eda9238425288efb3acdecc8a828714bd8
diff --git a/www-servers/tomcat/tomcat-6.0.26-r1.ebuild b/www-servers/tomcat/tomcat-6.0.26-r2.ebuild
index 456c1daaf622..1af9d8688afc 100644
--- a/www-servers/tomcat/tomcat-6.0.26-r1.ebuild
+++ b/www-servers/tomcat/tomcat-6.0.26-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.26-r1.ebuild,v 1.1 2010/06/06 12:32:34 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.26-r2.ebuild,v 1.1 2011/01/18 18:02:20 fordfrog Exp $
 
 EAPI=2
 JAVA_PKG_IUSE="doc examples source test"
@@ -130,6 +130,7 @@ src_install() {
 	cd "${S}"/webapps || die
 	ebegin "Installing webapps to /usr/share/${TOMCAT_NAME}"
 
+	dodir /usr/share/${TOMCAT_NAME}/webapps
 	cp -pR ROOT "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
 	cp -pR host-manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
 	cp -pR manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
diff --git a/www-servers/tomcat/tomcat-6.0.28.ebuild b/www-servers/tomcat/tomcat-6.0.28-r1.ebuild
index d3a8b4f99ec2..0fad60ad7173 100644
--- a/www-servers/tomcat/tomcat-6.0.28.ebuild
+++ b/www-servers/tomcat/tomcat-6.0.28-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.28.ebuild,v 1.2 2010/07/25 17:31:33 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.28-r1.ebuild,v 1.1 2011/01/18 18:02:20 fordfrog Exp $
 
 EAPI=2
 JAVA_PKG_IUSE="doc examples source test"
@@ -132,6 +132,7 @@ src_install() {
 	cd "${S}"/webapps || die
 	ebegin "Installing webapps to /usr/share/${TOMCAT_NAME}"
 
+	dodir /usr/share/${TOMCAT_NAME}/webapps
 	cp -pR ROOT "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
 	cp -pR host-manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
 	cp -pR manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
diff --git a/www-servers/tomcat/tomcat-6.0.29.ebuild b/www-servers/tomcat/tomcat-6.0.29-r1.ebuild
index c1895f3ae284..61d52e6045ba 100644
--- a/www-servers/tomcat/tomcat-6.0.29.ebuild
+++ b/www-servers/tomcat/tomcat-6.0.29-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.29.ebuild,v 1.1 2010/08/31 15:19:58 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.29-r1.ebuild,v 1.1 2011/01/18 18:02:20 fordfrog Exp $
 
 EAPI=2
 JAVA_PKG_IUSE="doc examples source test"
@@ -132,6 +132,7 @@ src_install() {
 	cd "${S}"/webapps || die
 	ebegin "Installing webapps to /usr/share/${TOMCAT_NAME}"
 
+	dodir /usr/share/${TOMCAT_NAME}/webapps
 	cp -pR ROOT "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
 	cp -pR host-manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
 	cp -pR manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
diff --git a/www-servers/tomcat/tomcat-7.0.5.ebuild b/www-servers/tomcat/tomcat-7.0.5-r1.ebuild
index 55676f2c9e43..11eed0e570c2 100644
--- a/www-servers/tomcat/tomcat-7.0.5.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.5.ebuild,v 1.1 2010/12/21 09:13:39 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.5-r1.ebuild,v 1.1 2011/01/18 18:02:20 fordfrog Exp $
 
 EAPI=2
 JAVA_PKG_IUSE="doc examples source test"
@@ -139,6 +139,7 @@ src_install() {
 	cd "${S}"/webapps || die
 	ebegin "Installing webapps to /usr/share/${TOMCAT_NAME}"
 
+	dodir /usr/share/${TOMCAT_NAME}/webapps
 	cp -pR ROOT "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
 	cp -pR host-manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
 	cp -pR manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die