From: Miroslav Šulc <fordfrog@gentoo.org>
Date: Sat, 24 Dec 2011 18:25:38 +0000 (+0000)
Subject: www-servers/tomcat: fixed documentation issues
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=3452b32a57e83bb12c476897372f449c06e41c34;p=gentoo.git

www-servers/tomcat: fixed documentation issues

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

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index e796ab0a1305..60156da221f3 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.271 2011/12/15 21:31:15 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.272 2011/12/24 18:25:38 fordfrog Exp $
+
+*tomcat-7.0.23-r2 (24 Dec 2011)
+
+  24 Dec 2011; Miroslav Å ulc <fordfrog@gentoo.org> -tomcat-7.0.23-r1.ebuild,
+  +tomcat-7.0.23-r2.ebuild:
+  Fixed installation of documentation (bug #393511, thanks to ron widler
+  <ron@einfach.org> for the fix). Also added symlink to docs to catalina base
+  webapps which fixes display of documentation from Tomcat default web app.
 
 *tomcat-7.0.23-r1 (15 Dec 2011)
 
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index faf02e43a5b5..d9d371a1d64b 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -24,6 +24,6 @@ EBUILD tomcat-5.5.27-r5.ebuild 10087 RMD160 f9f32edcf802c72499de5519e332aaf7b4b7
 EBUILD tomcat-6.0.32-r1.ebuild 6964 RMD160 a38e0536f45b4fbf5d4cbffb903a11c83948bdb4 SHA1 3196907adc07db41a62c43078c1c078a11e4d249 SHA256 00f8ecbc1676db5902971dd76d354e8b5bfe8938f285e9d5578e64160dcc087b
 EBUILD tomcat-6.0.33.ebuild 6961 RMD160 17c4cc0cd1bf9b681f612bf131f34440e1a67bae SHA1 1dbe88bf2615d57add8e0deab2074d653a7423f0 SHA256 ae706bb3f875113fa03dc4e9770cd43b033db449f75bb3c76e7bd9b1405c2036
 EBUILD tomcat-7.0.22-r1.ebuild 7055 RMD160 73f24c33a3ddbedd60ddae890a2bf0db684b1d61 SHA1 cfeea5c3f16128b6344873ecea2683407c0c012c SHA256 8d540db3b047725613c34b886d18d42799abe82fa82daa4373a2dff20b6d670a
-EBUILD tomcat-7.0.23-r1.ebuild 7617 RMD160 76c9ed4e07167e24dd6b91da34fd27de20d5abaa SHA1 7f11f31d8efd45e4ad714fda48aacea40b318683 SHA256 f9163ae30f907dfc7a2064612625359a4e2b681ec7c9ae48b3f384bfdd18ead9
-MISC ChangeLog 67463 RMD160 fba9e8ee6901e55b47545fd19854cc51e041c254 SHA1 7fea37e1010cb7ec4ba4915b0ed4963ebda27f8f SHA256 ec953b176d9de385a4f88c5c54570fa9d9daf55fdaff9c8a4e191092bed410d8
+EBUILD tomcat-7.0.23-r2.ebuild 7736 RMD160 4704b73b3960ed1754ed1089c867c83e9572710c SHA1 43824e3257002ec116354ffb7321d3e1fdf1703e SHA256 f8be1a48c434d084d6500c5cf1c2d6282d6f03681802d12cf26aa26f70d00cc7
+MISC ChangeLog 67830 RMD160 760d0457a59ae1e282af77e2cc6fc50fa9e70884 SHA1 fdff8be08700db8a06f907e9a81061307a6cf74d SHA256 1f0f47114ef167286f1f56fe2b1cfbd01188de690b780eff1085cbbc6eaffdc0
 MISC metadata.xml 521 RMD160 72b6ce433f5c9a65deaa0c1830c070c3adbcf33a SHA1 2c4f4fd887a5df9e955c711d0fcd21a5cab90a2d SHA256 dbab559e58c59eddd5df1c3bb39d17b26fadb587ad5dab51fc6fa7af5e601e22
diff --git a/www-servers/tomcat/tomcat-7.0.23-r1.ebuild b/www-servers/tomcat/tomcat-7.0.23-r2.ebuild
similarity index 96%
rename from www-servers/tomcat/tomcat-7.0.23-r1.ebuild
rename to www-servers/tomcat/tomcat-7.0.23-r2.ebuild
index d953141ff0c6..36ad554c72dd 100644
--- a/www-servers/tomcat/tomcat-7.0.23-r1.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.23-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.23-r1.ebuild,v 1.1 2011/12/15 21:31:15 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.23-r2.ebuild,v 1.1 2011/12/24 18:25:38 fordfrog Exp $
 
 EAPI=2
 JAVA_PKG_IUSE="doc examples source test"
@@ -143,7 +143,8 @@ src_install() {
 	cp -pR host-manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
 	cp -pR manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
 	if use doc; then
-		cp -pR docs "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
+		cp -pR "${S}"/output/build/webapps/docs "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
+		dosym /usr/share/${TOMCAT_NAME}/webapps/docs /var/lib/${TOMCAT_NAME}/webapps/docs || die
 	fi
 	if use examples; then
 		cd "${S}"/webapps/examples/WEB-INF/lib