diff options
| author |   William Thomson <wltjr@gentoo.org> | 2007-04-23 20:40:14 +0000 |
|---|---|---|
| committer | William Thomson <wltjr@gentoo.org> | 2007-04-23 20:40:14 +0000 |
| commit | 1bdd7a1076c285bf59fa578eb21bc7020131091f (patch) | |
| tree | 64123de4191b567438164b05301202adf47519f2 /www-servers | |
| parent | Stable on sparc (diff) | |
| download | gentoo-2-1bdd7a1076c285bf59fa578eb21bc7020131091f.tar.gz gentoo-2-1bdd7a1076c285bf59fa578eb21bc7020131091f.tar.bz2 gentoo-2-1bdd7a1076c285bf59fa578eb21bc7020131091f.zip | |
Moved jakarta-jstl from RDEPEND -> COMMON_DEPEND. Als removing those jars after unpack so they are not present during build.
(Portage version: 2.1.2.4)
Diffstat (limited to 'www-servers')
| -rw-r--r-- | www-servers/tomcat/ChangeLog | 9 | ||||
| -rw-r--r-- | www-servers/tomcat/files/digest-tomcat-6.0.10-r4 (renamed from www-servers/tomcat/files/digest-tomcat-6.0.10-r3) | 0 | ||||
| -rw-r--r-- | www-servers/tomcat/tomcat-6.0.10-r4.ebuild (renamed from www-servers/tomcat/tomcat-6.0.10-r3.ebuild) | 14 |
3 files changed, 17 insertions, 6 deletions
diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog index eae6f5bd3111..aec3098fcda8 100644 --- a/www-servers/tomcat/ChangeLog +++ b/www-servers/tomcat/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for www-servers/tomcat # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.135 2007/04/19 16:35:22 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.136 2007/04/23 20:40:14 wltjr Exp $ + +*tomcat-6.0.10-r4 (23 Apr 2007) + + 23 Apr 2007; William L. Thomson Jr. <wltjr@gentoo.org> + -tomcat-6.0.10-r3.ebuild, +tomcat-6.0.10-r4.ebuild: + Moved jakarta-jstl from RDEPEND -> COMMON_DEPEND. Als removing those jars + after unpack so they are not present during build. *tomcat-6.0.10-r3 (19 Apr 2007) diff --git a/www-servers/tomcat/files/digest-tomcat-6.0.10-r3 b/www-servers/tomcat/files/digest-tomcat-6.0.10-r4 index 3dd91cc642dc..3dd91cc642dc 100644 --- a/www-servers/tomcat/files/digest-tomcat-6.0.10-r3 +++ b/www-servers/tomcat/files/digest-tomcat-6.0.10-r4 diff --git a/www-servers/tomcat/tomcat-6.0.10-r3.ebuild b/www-servers/tomcat/tomcat-6.0.10-r4.ebuild index 0189fece44b4..8a75a202c345 100644 --- a/www-servers/tomcat/tomcat-6.0.10-r3.ebuild +++ b/www-servers/tomcat/tomcat-6.0.10-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.10-r3.ebuild,v 1.1 2007/04/19 16:35:22 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.10-r4.ebuild,v 1.1 2007/04/23 20:40:14 wltjr Exp $ WANT_ANT_TASKS="ant-trax" @@ -22,12 +22,12 @@ COMMON_DEPEND="=dev-java/eclipse-ecj-3.2* >=dev-java/commons-dbcp-1.2.1 >=dev-java/commons-logging-1.1 >=dev-java/commons-pool-1.2 - ~dev-java/tomcat-servlet-api-${PV}" + ~dev-java/tomcat-servlet-api-${PV} + examples? ( dev-java/jakarta-jstl )" RDEPEND=">=virtual/jre-1.5 dev-java/ant-core - ${COMMON_DEPEND} - examples? ( dev-java/jakarta-jstl )" + ${COMMON_DEPEND}" DEPEND=">=virtual/jdk-1.5 ${COMMON_DEPEND} @@ -49,6 +49,11 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}/${SLOT}/build-xml.patch" + + if use examples; then + cd webapps/examples/WEB-INF/lib/ + rm -v *.jar + fi } src_compile(){ @@ -135,7 +140,6 @@ src_install() { fi if use examples; then cd output/build/webapps/examples/WEB-INF/lib - rm -f *.jar java-pkg_jar-from jakarta-jstl jstl.jar java-pkg_jar-from jakarta-jstl standard.jar cd "${S}" |