x86 stable, bug #388131

Package-Manager: portage-2.1.10.34/cvs/Linux x86_64

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index f36a10a1a990953c7575c0331ffd6efbad12b342..346467cc4d6106322cc5194fbb0081c9ced61304 100644 (file)
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,9 @@
 # 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.267 2011/11/03 00:46:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.268 2011/11/13 15:02:17 maekke Exp $
+
+  13 Nov 2011; Markus Meier <maekke@gentoo.org> tomcat-6.0.33.ebuild:
+  x86 stable, bug #388131
 
   03 Nov 2011; Mike Frysinger <vapier@gentoo.org> tomcat-5.5.27-r4.ebuild,
   tomcat-5.5.27-r5.ebuild:

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 6e7e53747d5252516509bd6d2a58396b410752cb..e164a82a6073aaf2c64b9f18a9a9857d5da09189 100644 (file)
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX 5.5/26-main_tomcat_catalina_jasper_build_xml.patch 16573 RMD160 53f1deaa88a39459a584cf14c761cb411d68f2e6 SHA1 69b3ca39f9dbabe12c56865d47866c06dcb7c2e3 SHA256 99a2c1bb164d97407525305512a85e6139531d81a47aa2c25f5c2cfe50aee1f6
 AUX 5.5/5.5.27-dynamic-JSSE13Factory.patch 1853 RMD160 31d20202a3be06c156b0c13f0afb3b394b8ecf02 SHA1 d7e7640dd4f7b7b92b21ac51d1b508fe56691a81 SHA256 f7db0e692088ec25a4731a521c1da4a0075e747f68690235fde3ca93c6f2e19d
@@ -23,14 +23,14 @@ DIST apache-tomcat-7.0.22-src.tar.gz 4044650 RMD160 e49636d4555f92a4f56a46aee7fc
 EBUILD tomcat-5.5.27-r4.ebuild 10028 RMD160 39b0fde8bce7ca92a11d69992f1f8ba70404d70d SHA1 31953fe9665686f43d333608dfb73eff87717bae SHA256 bb074efd50f5164c4b07b97de1de0d77cc05c8548112de7f873fb1afe2b04b19
 EBUILD tomcat-5.5.27-r5.ebuild 10087 RMD160 f9f32edcf802c72499de5519e332aaf7b4b7efbf SHA1 7d494c9bd1ea4b6da8bf4913c8f28e7180d57535 SHA256 93e335594ff10e4bd9d9d2537f0ba5d701c909e181d0fe25d841b771743ec8fb
 EBUILD tomcat-6.0.32-r1.ebuild 6964 RMD160 a38e0536f45b4fbf5d4cbffb903a11c83948bdb4 SHA1 3196907adc07db41a62c43078c1c078a11e4d249 SHA256 00f8ecbc1676db5902971dd76d354e8b5bfe8938f285e9d5578e64160dcc087b
-EBUILD tomcat-6.0.33.ebuild 6964 RMD160 bdf0ef718421ae334f1477ff1efb0c3c4ec0f4b2 SHA1 8d27f1b93e091d3114d3cc4fef4b85cd956c4e9e SHA256 15776bbc32f99efc2778f545c9583154a42f55ac627762518b1f69b453f8fa8d
+EBUILD tomcat-6.0.33.ebuild 6961 RMD160 17c4cc0cd1bf9b681f612bf131f34440e1a67bae SHA1 1dbe88bf2615d57add8e0deab2074d653a7423f0 SHA256 ae706bb3f875113fa03dc4e9770cd43b033db449f75bb3c76e7bd9b1405c2036
 EBUILD tomcat-7.0.22-r1.ebuild 7061 RMD160 bee674c76e8b18d6f7151b8c97ca7ce518cbec5c SHA1 667080b1585a16af1153d09c65b338a803bd7f4b SHA256 4896d355fcfbd5053584d83b01d6cd94ab965daa61113a26110c44f7eb09ccde
-MISC ChangeLog 66811 RMD160 5a6624efd36ca85a6c22bfc0e102ed796599298e SHA1 b283e91d220966e75a2be0f94ae2f5cc8b4303d3 SHA256 a617c35692442096af26ba0f540f5e6e37ad2db659612126cb713abcd61547a3
+MISC ChangeLog 66908 RMD160 54e84860385bd21ed231950c1ca6cb44f5187332 SHA1 ca55c879f209ac9dc5ddf005b08816d7f0dcb9da SHA256 af6552dd07af55263186c04ca95a6fee189dcac2dfd6c3b08b317b46d04985eb
 MISC metadata.xml 521 RMD160 72b6ce433f5c9a65deaa0c1830c070c3adbcf33a SHA1 2c4f4fd887a5df9e955c711d0fcd21a5cab90a2d SHA256 dbab559e58c59eddd5df1c3bb39d17b26fadb587ad5dab51fc6fa7af5e601e22
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk6x5HUACgkQaC/OocHi7JaxOwD/TIfn7lUIkGOQD1DVBFAUEiB7
-IaFJJmPPAjgArU1XS+IA/Aku2bzMTxE+BwtxrOwpwRirTuBy6Dsx1Iuv7pVnsw12
-=y4IF
+iEYEARECAAYFAk6/3E4ACgkQkKaRLQcq0GLywgCfZ3kmbgWQWzTYPf6tozvGHiaF
+x2oAmgI6G/3WSUz0D1muhLALl/8Utp7N
+=ScYb
 -----END PGP SIGNATURE-----

diff --git a/www-servers/tomcat/tomcat-6.0.33.ebuild b/www-servers/tomcat/tomcat-6.0.33.ebuild
index aa245189853f89a3f2bab661e986ff5caa0cdab0..63b6804b8924c1a7d211663d9e61edb1dc35562f 100644 (file)
--- a/www-servers/tomcat/tomcat-6.0.33.ebuild
+++ b/www-servers/tomcat/tomcat-6.0.33.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-6.0.33.ebuild,v 1.2 2011/10/27 15:54:43 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.33.ebuild,v 1.3 2011/11/13 15:02:17 maekke Exp $
 
 EAPI=2
 JAVA_PKG_IUSE="doc examples source test"
@@ -14,7 +14,7 @@ MY_P="apache-${P}-src"
 SLOT="6"
 SRC_URI="mirror://apache/${PN}/${PN}-6/v${PV/_/-}/src/${MY_P}.tar.gz"
 HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
 LICENSE="Apache-2.0"
 
 IUSE=""