www-servers/tomcat: fixed bug #350645

(Portage version: 2.1.9.33/cvs/Linux x86_64)

5 files changed, 26 insertions, 10 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/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