From c07c70f95324ba478270416daffb717b4bceb8a0 Mon Sep 17 00:00:00 2001 From: William Thomson Date: Mon, 23 Apr 2007 20:40:14 +0000 Subject: [PATCH] Moved jakarta-jstl from RDEPEND -> COMMON_DEPEND. Als removing those jars after unpack so they are not present during build. Package-Manager: portage-2.1.2.4 --- www-servers/tomcat/ChangeLog | 9 +++++++- www-servers/tomcat/Manifest | 22 +++++++++---------- ...mcat-6.0.10-r3 => digest-tomcat-6.0.10-r4} | 0 ...0.10-r3.ebuild => tomcat-6.0.10-r4.ebuild} | 14 +++++++----- 4 files changed, 28 insertions(+), 17 deletions(-) rename www-servers/tomcat/files/{digest-tomcat-6.0.10-r3 => digest-tomcat-6.0.10-r4} (100%) rename www-servers/tomcat/{tomcat-6.0.10-r3.ebuild => tomcat-6.0.10-r4.ebuild} (96%) 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. + -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/Manifest b/www-servers/tomcat/Manifest index 1475a4a4db20..b9251634fd07 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -48,14 +48,14 @@ EBUILD tomcat-5.5.23-r1.ebuild 10584 RMD160 c42b0b5268b7cc6e4047fbf8da52b0be12a7 MD5 367fce83dfc2e05c71de752be7dfd1e4 tomcat-5.5.23-r1.ebuild 10584 RMD160 c42b0b5268b7cc6e4047fbf8da52b0be12a783dd tomcat-5.5.23-r1.ebuild 10584 SHA256 744de62a876d0b2567d80aa9c1252f37c8c4ad6d0f74920693692b0ddf59000c tomcat-5.5.23-r1.ebuild 10584 -EBUILD tomcat-6.0.10-r3.ebuild 5447 RMD160 30bde477c0f71d2f78030d318bb106d62611ac44 SHA1 9951d139e355f076abaee5fb0d77e04683641f7f SHA256 010618598b37cff4204289438117a0f637eb0832d96152bb77d20283e87f431f -MD5 55415fab4645acb6934928bfd6823388 tomcat-6.0.10-r3.ebuild 5447 -RMD160 30bde477c0f71d2f78030d318bb106d62611ac44 tomcat-6.0.10-r3.ebuild 5447 -SHA256 010618598b37cff4204289438117a0f637eb0832d96152bb77d20283e87f431f tomcat-6.0.10-r3.ebuild 5447 -MISC ChangeLog 43782 RMD160 65cfc443244c33e7b3bb813189f99b552e46f423 SHA1 3b286369774b1788728a176cdc9d07affafeab33 SHA256 b56ab3874870f78f6526fd33df8694679597496c7d0a37a5613718e28040364d -MD5 a009c58404fd0f0b74afa8bbfa801b2a ChangeLog 43782 -RMD160 65cfc443244c33e7b3bb813189f99b552e46f423 ChangeLog 43782 -SHA256 b56ab3874870f78f6526fd33df8694679597496c7d0a37a5613718e28040364d ChangeLog 43782 +EBUILD tomcat-6.0.10-r4.ebuild 5510 RMD160 0cb80c1315fe43650232e3166265026f481d5f9a SHA1 b1147f67215491bfdaf3657c1dc2261796eea759 SHA256 8d66e39ff8096386a8847caf1e789586d3bceba183e90683b86afa8194e09a55 +MD5 d787c758a58cda5825213c76ad0748d4 tomcat-6.0.10-r4.ebuild 5510 +RMD160 0cb80c1315fe43650232e3166265026f481d5f9a tomcat-6.0.10-r4.ebuild 5510 +SHA256 8d66e39ff8096386a8847caf1e789586d3bceba183e90683b86afa8194e09a55 tomcat-6.0.10-r4.ebuild 5510 +MISC ChangeLog 44056 RMD160 ff0dba5306827777076bd234f0cb99658d44846f SHA1 093fb87c1974abba2d59b0d57b59ef62db8f7be0 SHA256 11a5bd3e6c20e75f4ef6acf07d372b59f85cd7c142e2bb3d7fe2aedd04e1608e +MD5 71894f922f6e70ef3cd24a17c80616ee ChangeLog 44056 +RMD160 ff0dba5306827777076bd234f0cb99658d44846f ChangeLog 44056 +SHA256 11a5bd3e6c20e75f4ef6acf07d372b59f85cd7c142e2bb3d7fe2aedd04e1608e ChangeLog 44056 MISC metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 SHA1 e8dcd8204d0ea02558dd07e1aded5dc58ed1460c SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79 MD5 0609d3339e0b8d5a3b4707f6b02aad3a metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 metadata.xml 556 @@ -63,6 +63,6 @@ SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79 metadata MD5 6947c731df35ce2149f4a2f8009b575f files/digest-tomcat-5.5.23-r1 277 RMD160 c7a3b4f7dd1b085332606c3d6a68cc21f0ff78e2 files/digest-tomcat-5.5.23-r1 277 SHA256 7c1430575374307e6337ec7f22b7822c2093deb36bb3e9fffaa4cf8b23f34051 files/digest-tomcat-5.5.23-r1 277 -MD5 5f9244a61bfa0875478e8849b6cb845e files/digest-tomcat-6.0.10-r3 277 -RMD160 3d16b85b1dcb55e6874b535c06f2a5df00b46ce1 files/digest-tomcat-6.0.10-r3 277 -SHA256 49aef00c733c574a5c8536a6e5406769105dbe0b64ad0ea9b9682ca42bff23f0 files/digest-tomcat-6.0.10-r3 277 +MD5 5f9244a61bfa0875478e8849b6cb845e files/digest-tomcat-6.0.10-r4 277 +RMD160 3d16b85b1dcb55e6874b535c06f2a5df00b46ce1 files/digest-tomcat-6.0.10-r4 277 +SHA256 49aef00c733c574a5c8536a6e5406769105dbe0b64ad0ea9b9682ca42bff23f0 files/digest-tomcat-6.0.10-r4 277 diff --git a/www-servers/tomcat/files/digest-tomcat-6.0.10-r3 b/www-servers/tomcat/files/digest-tomcat-6.0.10-r4 similarity index 100% rename from www-servers/tomcat/files/digest-tomcat-6.0.10-r3 rename to 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 similarity index 96% rename from www-servers/tomcat/tomcat-6.0.10-r3.ebuild rename to 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}" -- 2.26.2