diff options
| -rw-r--r-- | www-servers/tomcat/ChangeLog | 8 | ||||
| -rw-r--r-- | www-servers/tomcat/Manifest | 4 | ||||
| -rw-r--r-- | www-servers/tomcat/tomcat-7.0.23-r3.ebuild (renamed from www-servers/tomcat/tomcat-7.0.23-r2.ebuild) | 6 |
3 files changed, 11 insertions, 7 deletions
diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog index db88d8380e89..d214671006ba 100644 --- a/www-servers/tomcat/ChangeLog +++ b/www-servers/tomcat/ChangeLog @@ -1,6 +1,12 @@ # 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.273 2011/12/24 19:43:50 fordfrog Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.274 2011/12/24 19:50:24 fordfrog Exp $ + +*tomcat-7.0.23-r3 (24 Dec 2011) + + 24 Dec 2011; Miroslav Šulc <fordfrog@gentoo.org> -tomcat-7.0.23-r2.ebuild, + +tomcat-7.0.23-r3.ebuild: + Removed the doc symlink because copying of doc is handled in post_inst. *tomcat-6.0.35 (24 Dec 2011) diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index b87a5ad39c30..f88c746bae2c 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -27,6 +27,6 @@ EBUILD tomcat-6.0.32-r1.ebuild 6964 RMD160 a38e0536f45b4fbf5d4cbffb903a11c83948b EBUILD tomcat-6.0.33.ebuild 6961 RMD160 17c4cc0cd1bf9b681f612bf131f34440e1a67bae SHA1 1dbe88bf2615d57add8e0deab2074d653a7423f0 SHA256 ae706bb3f875113fa03dc4e9770cd43b033db449f75bb3c76e7bd9b1405c2036 EBUILD tomcat-6.0.35.ebuild 6991 RMD160 c5bf0072768c23112e98f8d0f05d852446ce48f1 SHA1 079bc1830ee5dff2c8d37d24846e478f3a94c4ef SHA256 4292e84c08ba397bf26cbe3ae1df1c77058b52871b5e3578da5441d14161db1a EBUILD tomcat-7.0.22-r1.ebuild 7055 RMD160 73f24c33a3ddbedd60ddae890a2bf0db684b1d61 SHA1 cfeea5c3f16128b6344873ecea2683407c0c012c SHA256 8d540db3b047725613c34b886d18d42799abe82fa82daa4373a2dff20b6d670a -EBUILD tomcat-7.0.23-r2.ebuild 7736 RMD160 4704b73b3960ed1754ed1089c867c83e9572710c SHA1 43824e3257002ec116354ffb7321d3e1fdf1703e SHA256 f8be1a48c434d084d6500c5cf1c2d6282d6f03681802d12cf26aa26f70d00cc7 -MISC ChangeLog 68169 RMD160 10be71c098117c5b565724a86c0dc6a2f7312064 SHA1 b1c832c2158d22ba12a8b6f08c15061dfbab2673 SHA256 255d071231be5ef6a0e27ef12053a0ba37d202f662fbdc340ef313908bc3fd7a +EBUILD tomcat-7.0.23-r3.ebuild 7643 RMD160 e75ab8264d8a6b453133e4fc6bdd06d563966ef4 SHA1 e8fbbba6502bf1ca7fab91ce317563575874c3f6 SHA256 bfc37412b9c261a7de5269dccd8066b743affe55bff05b1adf0dcbc7a9fd8e76 +MISC ChangeLog 68383 RMD160 9f65645b99a27444e953335c212fa8618f306692 SHA1 9a58769573a1de325942df14410c6356348a1013 SHA256 3ee95f71c6193304a9c144ebee7ce60a1c5d059371731e2ac15a90efb22c496b MISC metadata.xml 521 RMD160 72b6ce433f5c9a65deaa0c1830c070c3adbcf33a SHA1 2c4f4fd887a5df9e955c711d0fcd21a5cab90a2d SHA256 dbab559e58c59eddd5df1c3bb39d17b26fadb587ad5dab51fc6fa7af5e601e22 diff --git a/www-servers/tomcat/tomcat-7.0.23-r2.ebuild b/www-servers/tomcat/tomcat-7.0.23-r3.ebuild index 36ad554c72dd..a343abc3cc27 100644 --- a/www-servers/tomcat/tomcat-7.0.23-r2.ebuild +++ b/www-servers/tomcat/tomcat-7.0.23-r3.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-r2.ebuild,v 1.1 2011/12/24 18:25:38 fordfrog Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.23-r3.ebuild,v 1.1 2011/12/24 19:50:24 fordfrog Exp $ EAPI=2 JAVA_PKG_IUSE="doc examples source test" @@ -144,7 +144,6 @@ src_install() { cp -pR manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die if use doc; then 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 @@ -195,8 +194,7 @@ pkg_postinst() { elog "${ROOT}usr/share/${TOMCAT_NAME}/webapps instead" elog elog "Manager Symbolic Links NOT created." - - else + else einfo "Installing latest webroot to ${ROOT}/${WEBAPPS_DIR}" cp -pR "${ROOT}"/usr/share/${TOMCAT_NAME}/webapps/* \ "${ROOT}""${WEBAPPS_DIR}" |