Updated dep on commons-modeler to >=2.0 per bug #172734. Also added ewarn output about missing dbcp.jar per bug #144276

Package-Manager: portage-2.1.2.2

5 files changed, 44 insertions, 38 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 9188c87e2329..6f1b86f154ef 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,11 @@
 # 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.128 2007/03/29 15:27:58 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.129 2007/03/30 23:17:05 wltjr Exp $
+
+  30 Mar 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  tomcat-5.5.20-r8.ebuild, tomcat-5.5.23.ebuild, tomcat-6.0.10-r1.ebuild:
+  Updated dep on commons-modeler to >=2.0 per bug #172734. Also added ewarn
+  output about missing dbcp.jar per bug #144276
 
   29 Mar 2007; William L. Thomson Jr. <wltjr@gentoo.org>
   -files/5.0.28/build.xml-01.patch, -files/5.0.28/gentoo.diff,
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 820c577166e6..4cd38a230af0 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -89,22 +89,22 @@ SHA256 5f06449e261300a0f6ba6cb67f0908ddceb8c0ea06178ac41c791055068ec72b files/6/
 DIST apache-tomcat-5.5.20-src.tar.gz 4796377 RMD160 587590d2e272d1ede73501b62933f544cd969822 SHA1 cc416242d8c9e1978702a207e305ca97afe53d4d SHA256 19f24717fb3e2db902c33e21650dfa88bbf98428c15b1ed68ecaf7a9150e4a77
 DIST apache-tomcat-5.5.23-src.tar.gz 4895919 RMD160 fe669f6b864fd7dcf4ad74dad22a0256e5417005 SHA1 59272b5eedde9c32a126679ff9e1d2a5f56265c8 SHA256 e2f7ce250643349507b511a5ea96df7364030a061a8f4d5b71d8b5a099e2b6bd
 DIST apache-tomcat-6.0.10-src.tar.gz 3221070 RMD160 64762f16606645c6ef507906f2eb8eeb102173bb SHA1 4ec1acda174ab19082c4900c293d8bc7f9544a69 SHA256 54ae6b89a3ac3e3e33a580708403ca4ea0a449f287b91e6246bb6a6550e39199
-EBUILD tomcat-5.5.20-r8.ebuild 10247 RMD160 8c2386f42e6114487cae1b200a42a5b2fa5d11e6 SHA1 bd5a1f59dec4cecdfff22da90ea877a8322e8d1b SHA256 594ad49a012319f082ce18bc1db4c74647ae010d24db21a3b6522e834b89e2c8
-MD5 ecdb33ec17baffd1b08a8cb0a0a84926 tomcat-5.5.20-r8.ebuild 10247
-RMD160 8c2386f42e6114487cae1b200a42a5b2fa5d11e6 tomcat-5.5.20-r8.ebuild 10247
-SHA256 594ad49a012319f082ce18bc1db4c74647ae010d24db21a3b6522e834b89e2c8 tomcat-5.5.20-r8.ebuild 10247
-EBUILD tomcat-5.5.23.ebuild 10539 RMD160 8cf2dd7934957df4f41b58260dac88938237512a SHA1 e6227dde68d3a4e74323d627996fc4e0bf31d63b SHA256 b15bb512df748e54820bc9612008973e33b0f276a3f283f16e6f1bc7dff5a23d
-MD5 7a48deb1837cf583f98bd8fa1a2a0cae tomcat-5.5.23.ebuild 10539
-RMD160 8cf2dd7934957df4f41b58260dac88938237512a tomcat-5.5.23.ebuild 10539
-SHA256 b15bb512df748e54820bc9612008973e33b0f276a3f283f16e6f1bc7dff5a23d tomcat-5.5.23.ebuild 10539
-EBUILD tomcat-6.0.10-r1.ebuild 4878 RMD160 5098ffd69ef3338c3d2e4626edbc92c0ee94da3d SHA1 53a949197d31c45e0d0a7b7e3e9c030f5a9f057c SHA256 bd075832d3b7cc5d7df03956675045ddf739989502ef1781ecba93d393bb489a
-MD5 fac9f173878df0cd2efcc7626ef7de79 tomcat-6.0.10-r1.ebuild 4878
-RMD160 5098ffd69ef3338c3d2e4626edbc92c0ee94da3d tomcat-6.0.10-r1.ebuild 4878
-SHA256 bd075832d3b7cc5d7df03956675045ddf739989502ef1781ecba93d393bb489a tomcat-6.0.10-r1.ebuild 4878
-MISC ChangeLog 41634 RMD160 55be0d95c767d0c148685dcc831c5c531bb7a0fb SHA1 db82a03313d6d980c7206998e73cb470e0dd1022 SHA256 3a8d4485caa6ac1ca8e8718b1a32b6f8e16e1fe2fead356865901e4e2f1ee200
-MD5 db2b1a1889c2116abc11960e31ba8ebd ChangeLog 41634
-RMD160 55be0d95c767d0c148685dcc831c5c531bb7a0fb ChangeLog 41634
-SHA256 3a8d4485caa6ac1ca8e8718b1a32b6f8e16e1fe2fead356865901e4e2f1ee200 ChangeLog 41634
+EBUILD tomcat-5.5.20-r8.ebuild 10244 RMD160 d99fee7973616b0b7f165ccdb1d2126a7fee031c SHA1 4afb713b944a6572769183cf0b873e7ce5cdbee4 SHA256 215bb2f0f8ef97b47f2003c5c79862b54243a0decb52d965a51af45590f93ec9
+MD5 b35390dd66d703bef0d76905378f3f8c tomcat-5.5.20-r8.ebuild 10244
+RMD160 d99fee7973616b0b7f165ccdb1d2126a7fee031c tomcat-5.5.20-r8.ebuild 10244
+SHA256 215bb2f0f8ef97b47f2003c5c79862b54243a0decb52d965a51af45590f93ec9 tomcat-5.5.20-r8.ebuild 10244
+EBUILD tomcat-5.5.23.ebuild 10536 RMD160 04b34cdf8b4a7f94ac6f27675329f56934483a08 SHA1 230d6461f32f638e1d6be8670de6a053b169efd8 SHA256 8441ec3f77be4ed8a9f61b2d74386ff423b124f027a1e29acb3a40bff49a6cbb
+MD5 776a987f7a5678daac42a02ecb01e331 tomcat-5.5.23.ebuild 10536
+RMD160 04b34cdf8b4a7f94ac6f27675329f56934483a08 tomcat-5.5.23.ebuild 10536
+SHA256 8441ec3f77be4ed8a9f61b2d74386ff423b124f027a1e29acb3a40bff49a6cbb tomcat-5.5.23.ebuild 10536
+EBUILD tomcat-6.0.10-r1.ebuild 5020 RMD160 47410070eee746c2e9d35934acad4f1d826a56d2 SHA1 3dc49b928e184a0f7a09f0169c61d6beb836840a SHA256 9adb6e238ea27e8febeaaf0279c721f287bc0118dea14d62cdf0c57caca4dfe2
+MD5 d10ccf2250d5978776b327eb2114abc0 tomcat-6.0.10-r1.ebuild 5020
+RMD160 47410070eee746c2e9d35934acad4f1d826a56d2 tomcat-6.0.10-r1.ebuild 5020
+SHA256 9adb6e238ea27e8febeaaf0279c721f287bc0118dea14d62cdf0c57caca4dfe2 tomcat-6.0.10-r1.ebuild 5020
+MISC ChangeLog 41890 RMD160 40f7991444e4fc1ca18f89537bddb73a2345aad0 SHA1 6b1a3718048934499f56a5b76ba07ce500fb7018 SHA256 0679fb55c75283a27f7d11b4c4455cd74e02035abda217738e6b49f4f402e9d9
+MD5 157940a8137073d799811c13cfcc5647 ChangeLog 41890
+RMD160 40f7991444e4fc1ca18f89537bddb73a2345aad0 ChangeLog 41890
+SHA256 0679fb55c75283a27f7d11b4c4455cd74e02035abda217738e6b49f4f402e9d9 ChangeLog 41890
 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-r8.ebuild b/www-servers/tomcat/tomcat-5.5.20-r8.ebuild
index bdfa0490bf4b..4b0f7c323b3f 100644
--- a/www-servers/tomcat/tomcat-5.5.20-r8.ebuild
+++ b/www-servers/tomcat/tomcat-5.5.20-r8.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-r8.ebuild,v 1.6 2007/03/13 00:06:53 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.20-r8.ebuild,v 1.7 2007/03/30 23:17:05 wltjr Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -273,18 +273,17 @@ pkg_postinst() {
 	chown root:root /etc/init.d/${TOMCAT_NAME}
 	chown root:root /etc/conf.d/${TOMCAT_NAME}
 
-	ewarn
-	ewarn " This ebuild implements a new filesystem layout for tomcat"
-	ewarn " please read http://www.gentoo.org/proj/en/java/tomcat-guide.xml"
-	ewarn " for more information!."
+	elog
+	elog " This ebuild implements a new filesystem layout for tomcat"
+	elog " please read http://www.gentoo.org/proj/en/java/tomcat-guide.xml"
+	elog " for more information!."
+	elog
+	ewarn "naming-factory-dbcp.jar is not built at this time. Please fetch"
+	ewarn "jar from upstream binary if you need it. Gentoo Bug # 144276"
 	elog
 	elog " Please file any bugs at http://bugs.gentoo.org/ or else it"
 	elog " may not get seen.  Thank you."
 	elog
-
-#	elog "Run emerge --config =${PF}"
-#	elog "to configure Tomcat if you need to for example"
-#	elog "change the home directory of the Tomcat user."
 }
 
 #helpers
diff --git a/www-servers/tomcat/tomcat-5.5.23.ebuild b/www-servers/tomcat/tomcat-5.5.23.ebuild
index eb33eeae8ec5..2b46aa23279f 100644
--- a/www-servers/tomcat/tomcat-5.5.23.ebuild
+++ b/www-servers/tomcat/tomcat-5.5.23.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.23.ebuild,v 1.2 2007/03/13 00:06:53 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.23.ebuild,v 1.3 2007/03/30 23:17:05 wltjr Exp $
 
 WANT_ANT_TASKS="ant-trax"
 
@@ -29,7 +29,7 @@ RDEPEND="=dev-java/eclipse-ecj-3.2*
 	>=dev-java/commons-el-1.0
 	>=dev-java/commons-launcher-0.9
 	>=dev-java/commons-logging-1.0.4
-	>=dev-java/commons-modeler-1.1
+	>=dev-java/commons-modeler-2.0
 	>=dev-java/commons-pool-1.2
 	>=dev-java/junit-3.8.1
 	>=dev-java/log4j-1.2.9
@@ -270,18 +270,17 @@ pkg_postinst() {
 	chown root:root /etc/init.d/${TOMCAT_NAME}
 	chown root:root /etc/conf.d/${TOMCAT_NAME}
 
-	ewarn
-	ewarn " This ebuild implements a new filesystem layout for tomcat"
-	ewarn " please read http://www.gentoo.org/proj/en/java/tomcat-guide.xml"
-	ewarn " for more information!."
+	elog
+	elog " This ebuild implements a new filesystem layout for tomcat"
+	elog " please read http://www.gentoo.org/proj/en/java/tomcat-guide.xml"
+	elog " for more information!."
+	elog
+	ewarn "naming-factory-dbcp.jar is not built at this time. Please fetch"
+	ewarn "jar from upstream binary if you need it. Gentoo Bug # 144276"
 	elog
 	elog " Please file any bugs at http://bugs.gentoo.org/ or else it"
 	elog " may not get seen.  Thank you."
 	elog
-
-#	elog "Run emerge --config =${PF}"
-#	elog "to configure Tomcat if you need to for example"
-#	elog "change the home directory of the Tomcat user."
 }
 
 #helpers
diff --git a/www-servers/tomcat/tomcat-6.0.10-r1.ebuild b/www-servers/tomcat/tomcat-6.0.10-r1.ebuild
index da3fa6357dd7..273b388b3c61 100644
--- a/www-servers/tomcat/tomcat-6.0.10-r1.ebuild
+++ b/www-servers/tomcat/tomcat-6.0.10-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-6.0.10-r1.ebuild,v 1.1 2007/03/20 04:35:11 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.10-r1.ebuild,v 1.2 2007/03/30 23:17:05 wltjr Exp $
 
 WANT_ANT_TASKS="ant-trax"
 
@@ -150,9 +150,12 @@ src_install() {
 pkg_postinst() {
 	elog
 	elog " This ebuild implements a FHS compliant layout for tomcat"
-	elog " Please read http://www.gentoo.org/proj/en/java/tomcat-guide.xml"
+	elog " Please read http://www.gentoo.org/proj/en/java/tomcat6-guide.xml"
 	elog " for more information."
 	elog
+	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+	elog
 	elog " Please report any bugs to http://bugs.gentoo.org/"
 	elog
 }