diff options
| author |   Miroslav Šulc <fordfrog@gentoo.org> | 2011-12-24 19:50:24 +0000 |
|---|---|---|
| committer | Miroslav Šulc <fordfrog@gentoo.org> | 2011-12-24 19:50:24 +0000 |
| commit | 9bca62d050cd2c32416f498a2cf70fe123d44854 (patch) | |
| tree | bdbe9f074ed53ada17e1a98fe51a19a577b7486b | |
| parent | Update to 5.0.1.3592 (diff) | |
| download | gentoo-2-9bca62d050cd2c32416f498a2cf70fe123d44854.tar.gz gentoo-2-9bca62d050cd2c32416f498a2cf70fe123d44854.tar.bz2 gentoo-2-9bca62d050cd2c32416f498a2cf70fe123d44854.zip | |
www-servers/tomcat: minor fix
(Portage version: 2.1.10.43/cvs/Linux x86_64)
| -rw-r--r-- | www-servers/tomcat/ChangeLog | 8 | ||||
| -rw-r--r-- | www-servers/tomcat/tomcat-7.0.23-r3.ebuild (renamed from www-servers/tomcat/tomcat-7.0.23-r2.ebuild) | 6 |
2 files changed, 9 insertions, 5 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/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}" |