Ebuild cleanups

Package-Manager: portage-2.1.2-r11

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 5ac36f1cada6efede1c7c108f040f63982b1ba9b..1036f7fc10e37a1afae409ecff2116cfb949c403 100644 (file)
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,10 @@
 # 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.122 2007/02/15 02:19:06 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.123 2007/02/27 18:54:16 wltjr Exp $
+
+  27 Feb 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  tomcat-5.5.20-r10.ebuild, tomcat-5.5.22_pre-r1.ebuild:
+  Ebuild cleanups
 
 *tomcat-5.5.22_pre-r1 (15 Feb 2007)
 

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index b19d7cbf71c562a39e5debb11cbbdfcb7821d288..46cd75370b531f49c3472b3fd73f30c8b88af97c 100644 (file)
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -147,18 +147,18 @@ EBUILD tomcat-5.0.28-r14.ebuild 9331 RMD160 e88ac9bae92fc262ad9b7c37ef6926299431
 MD5 2729d48603266ae1654d7f6823109afb tomcat-5.0.28-r14.ebuild 9331
 RMD160 e88ac9bae92fc262ad9b7c37ef692629943167d9 tomcat-5.0.28-r14.ebuild 9331
 SHA256 b92c98a7411e5c80ea220a9245727c528440670fa7c29a025f71b18f97529c49 tomcat-5.0.28-r14.ebuild 9331
-EBUILD tomcat-5.5.20-r10.ebuild 10693 RMD160 5ebabd35254ffdbf12eca539a660c4325b6258dd SHA1 d67b35f7feed5113aaf1a2906d03112bd4a39df5 SHA256 c120cf798dd4ca584182c1afb5b22fdf8359c39a267190b240b75a6b8c2d8296
-MD5 a326a773f05142e7f62cdd7061af232c tomcat-5.5.20-r10.ebuild 10693
-RMD160 5ebabd35254ffdbf12eca539a660c4325b6258dd tomcat-5.5.20-r10.ebuild 10693
-SHA256 c120cf798dd4ca584182c1afb5b22fdf8359c39a267190b240b75a6b8c2d8296 tomcat-5.5.20-r10.ebuild 10693
+EBUILD tomcat-5.5.20-r10.ebuild 10583 RMD160 e9fe1fd982c75c8ebbe2bd44da9e2ede227dacfb SHA1 b7a89a078ede024b96413c4a8f2947c9e8a6f4f6 SHA256 968e1ff4c7dcd4ac1da1ec2906dcf036dab12971a7112816bf767f0a29067994
+MD5 351daf8c9a3aefd99a96ef390bf45ea1 tomcat-5.5.20-r10.ebuild 10583
+RMD160 e9fe1fd982c75c8ebbe2bd44da9e2ede227dacfb tomcat-5.5.20-r10.ebuild 10583
+SHA256 968e1ff4c7dcd4ac1da1ec2906dcf036dab12971a7112816bf767f0a29067994 tomcat-5.5.20-r10.ebuild 10583
 EBUILD tomcat-5.5.20-r8.ebuild 10296 RMD160 d745378ce830fbdc415f0f2de81e976cbff91993 SHA1 1c8830fbb27cea64307f2836eb476b0bb153757e SHA256 72b899ccde992f7248ff3ce20b9274327c45790c94a4b924d4c09e8dd5528035
 MD5 57d15320f6132d2222e2c9036c583f18 tomcat-5.5.20-r8.ebuild 10296
 RMD160 d745378ce830fbdc415f0f2de81e976cbff91993 tomcat-5.5.20-r8.ebuild 10296
 SHA256 72b899ccde992f7248ff3ce20b9274327c45790c94a4b924d4c09e8dd5528035 tomcat-5.5.20-r8.ebuild 10296
-EBUILD tomcat-5.5.22_pre-r1.ebuild 10825 RMD160 8e90c747485fb855a645c3277ac7d0432630a0e5 SHA1 15e3655e59f43ece0af68528e6992536a550ed40 SHA256 8af68af267a04a0f47d2e80cf84aaaca05d89b00656b7349c679044c820430aa
-MD5 486f7844d5e70ac19b65c600f5edc034 tomcat-5.5.22_pre-r1.ebuild 10825
-RMD160 8e90c747485fb855a645c3277ac7d0432630a0e5 tomcat-5.5.22_pre-r1.ebuild 10825
-SHA256 8af68af267a04a0f47d2e80cf84aaaca05d89b00656b7349c679044c820430aa tomcat-5.5.22_pre-r1.ebuild 10825
+EBUILD tomcat-5.5.22_pre-r1.ebuild 10715 RMD160 bc361580d3815f1a32228d729eac0b614b7a3a54 SHA1 776fe965312bd6ab1d835b279d6ab9376f4b22d2 SHA256 f779c14cbc5bdb7816007794d9eebc7e66c0d608d64eb720f7e2631093d6b228
+MD5 8fc346bc15c953061b52717b9eedc70d tomcat-5.5.22_pre-r1.ebuild 10715
+RMD160 bc361580d3815f1a32228d729eac0b614b7a3a54 tomcat-5.5.22_pre-r1.ebuild 10715
+SHA256 f779c14cbc5bdb7816007794d9eebc7e66c0d608d64eb720f7e2631093d6b228 tomcat-5.5.22_pre-r1.ebuild 10715
 EBUILD tomcat-6.0.10_pre.ebuild 5083 RMD160 e6aa0c1fe440de1214523ca7c7c00f4415c29043 SHA1 a3d555038ac5d551b23bb2d98e64d9cfd8958d23 SHA256 1a659b2ef2bdd7af54924b4b5c82efec59e2d3dea450026b087a8c91753039f0
 MD5 15f646ff747ecfc7489134ba7e5f53ba tomcat-6.0.10_pre.ebuild 5083
 RMD160 e6aa0c1fe440de1214523ca7c7c00f4415c29043 tomcat-6.0.10_pre.ebuild 5083
@@ -167,10 +167,10 @@ EBUILD tomcat-6.0.9_beta.ebuild 5011 RMD160 8d26faa0d5807413feb91c7c8de356a6a438
 MD5 145ef69975816401b17b7f32369556d5 tomcat-6.0.9_beta.ebuild 5011
 RMD160 8d26faa0d5807413feb91c7c8de356a6a438462f tomcat-6.0.9_beta.ebuild 5011
 SHA256 443e7cb5b0c4daedf0e35280f6e240bc9a95bb45587408585d8918a9a0429787 tomcat-6.0.9_beta.ebuild 5011
-MISC ChangeLog 1173 RMD160 18b786016102fa4bd445edc0c172a03cae1e1037 SHA1 b13d43b5ee046bbbe6cfb050fb97d49ae9bce961 SHA256 8e1274305e83fc46f91ac34de9a29626827614fa6c90d2595cfa16eea5cf5a5e
-MD5 bcd9617664151a99f98153cb31231c80 ChangeLog 1173
-RMD160 18b786016102fa4bd445edc0c172a03cae1e1037 ChangeLog 1173
-SHA256 8e1274305e83fc46f91ac34de9a29626827614fa6c90d2595cfa16eea5cf5a5e ChangeLog 1173
+MISC ChangeLog 1306 RMD160 1cac8fecca515e6c4d8b85aa4173398cbed92ad4 SHA1 b12c0eef42ad1550cbf0ef45cf6fdb40d0f0f3d8 SHA256 bcb264599fd3d7b15d5ea74ac5532d6614b0a89962a55f2252a73c05d51b5d55
+MD5 28c1c64d5685c1e9ba4ab3da9ecaa50b ChangeLog 1306
+RMD160 1cac8fecca515e6c4d8b85aa4173398cbed92ad4 ChangeLog 1306
+SHA256 bcb264599fd3d7b15d5ea74ac5532d6614b0a89962a55f2252a73c05d51b5d55 ChangeLog 1306
 MISC metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 SHA1 e8dcd8204d0ea02558dd07e1aded5dc58ed1460c SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79
 MD5 0609d3339e0b8d5a3b4707f6b02aad3a metadata.xml 556
 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 metadata.xml 556

diff --git a/www-servers/tomcat/tomcat-5.5.20-r10.ebuild b/www-servers/tomcat/tomcat-5.5.20-r10.ebuild
index c8b698660e7ac4e1d08ac7baea7e49fc642909bc..f3b2dd6efea6055dcbef9d204daa628dac063e96 100644 (file)
--- a/www-servers/tomcat/tomcat-5.5.20-r10.ebuild
+++ b/www-servers/tomcat/tomcat-5.5.20-r10.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-5.5.20-r10.ebuild,v 1.4 2007/02/15 02:19:06 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.20-r10.ebuild,v 1.5 2007/02/27 18:54:16 wltjr Exp $
 
 WANT_ANT_TASKS="ant-trax"
 
@@ -61,11 +61,6 @@ pkg_setup() {
        enewuser tomcat -1 -1 /dev/null tomcat
 
        java-pkg_filter-compiler ecj-3.1  ecj-3.2
-
-       if use java5; then
-               JAVA_PKG_WANT_SOURCE="1.5"
-               JAVA_PKG_WANT_TARGET="1.5"
-       fi
 }
 
 src_unpack() {
@@ -96,9 +91,6 @@ src_unpack() {
        if ! use java5; then
                java-pkg_jar-from mx4j-core-3.0 mx4j.jar jmx.jar
                java-pkg_jar-from mx4j-core-3.0 mx4j-rjmx.jar jmx-remote.jar
-       fi
-
-       if ! use java5; then
                mkdir ${S}/build/build/common/endorsed && cd ${S}/build/build/common/endorsed
                java-pkg_jar-from xml-commons-external-1.3 xml-apis.jar
                java-pkg_jar-from xerces-2 xercesImpl.jar

diff --git a/www-servers/tomcat/tomcat-5.5.22_pre-r1.ebuild b/www-servers/tomcat/tomcat-5.5.22_pre-r1.ebuild
index 2c8972a836a106b72aad5d9480a59aa33948d875..a8505390b6a9490195efb381e425cad7d271649a 100644 (file)
--- a/www-servers/tomcat/tomcat-5.5.22_pre-r1.ebuild
+++ b/www-servers/tomcat/tomcat-5.5.22_pre-r1.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-5.5.22_pre-r1.ebuild,v 1.1 2007/02/15 02:19:06 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.22_pre-r1.ebuild,v 1.2 2007/02/27 18:54:16 wltjr Exp $
 
 WANT_ANT_TASKS="ant-trax"
 
@@ -63,11 +63,6 @@ pkg_setup() {
        enewuser tomcat -1 -1 /dev/null tomcat
 
        java-pkg_filter-compiler ecj-3.1  ecj-3.2
-
-       if use java5; then
-               JAVA_PKG_WANT_SOURCE="1.5"
-               JAVA_PKG_WANT_TARGET="1.5"
-       fi
 }
 
 src_unpack() {
@@ -98,9 +93,6 @@ src_unpack() {
        if ! use java5; then
                java-pkg_jar-from mx4j-core-3.0 mx4j.jar jmx.jar
                java-pkg_jar-from mx4j-core-3.0 mx4j-rjmx.jar jmx-remote.jar
-       fi
-
-       if ! use java5; then
                mkdir ${S}/build/build/common/endorsed && cd ${S}/build/build/common/endorsed
                java-pkg_jar-from xml-commons-external-1.3 xml-apis.jar
                java-pkg_jar-from xerces-2 xercesImpl.jar