x86 stable wrt bug #395933

Package-Manager: portage-2.1.10.41/cvs/Linux i686

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 97cca976f50661ff8d6f396ed17528dc52733c5b..36e4b5accae68ec0e4e8b3e0219f6851157cfa16 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.278 2011/12/30 12:04:54 fordfrog Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.279 2012/01/04 17:59:40 phajdan.jr Exp $
+
+  04 Jan 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> tomcat-6.0.35.ebuild:
+  x86 stable wrt bug #395933
 
   30 Dec 2011; Miroslav Šulc <fordfrog@gentoo.org>
   -files/7/7.0.22-build-xml.patch, -tomcat-7.0.22-r1.ebuild:

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 594f1fa9dd05890890f5eee7ed20a6afd6e38497..45cbb699bfbd5263e527479df19997bca8398fbc 100644 (file)
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX 6/catalina.policy 6956 RMD160 957ad3b5dc4aeaa5acd289cdaada0a2e48974d52 SHA1 13b65455c8f52fff9d1b09ea67e93ec7a88f1a47 SHA256 9399efda3f6cfc238fb783fb338060e67aff15d0044b31c3d0265e1f9e5769e5
 AUX 6/tomcat.conf 2895 RMD160 36ece62ddff5257c04f47d75b9c77bd4dc198652 SHA1 8fef42463b7bf186e2f1d1aeb083bdb370603265 SHA256 b04b085618be755ad9e1796fcbcbb8c2e192eefda3b240f1c06b0d9cc88f2ff0
 AUX 6/tomcat.init.2 4034 RMD160 28a47d7e62ac5437eb2c9164f4595bd67b86f676 SHA1 c55f843f15db90e3e0af6069dfefc91daa4e0015 SHA256 55abf160871648ebeca531865b5918846cf298dadc9cdc5cc7ee060a8db487ad
@@ -12,7 +15,14 @@ DIST apache-tomcat-6.0.35-src.tar.gz 3403286 RMD160 d292b210fe62aafec4a074e3a626
 DIST apache-tomcat-7.0.23-src.tar.gz 4103854 RMD160 ebe500ffcc7903c6f4d301533a2a16cb878d11ef SHA1 fe56adb0939825c4f7c0f69e57858b1fb93ae958 SHA256 b86523095b06d58b9553683f480250dec7216ce1914c92ea8ecca0799e6ad3b0
 EBUILD tomcat-6.0.32-r1.ebuild 6964 RMD160 a38e0536f45b4fbf5d4cbffb903a11c83948bdb4 SHA1 3196907adc07db41a62c43078c1c078a11e4d249 SHA256 00f8ecbc1676db5902971dd76d354e8b5bfe8938f285e9d5578e64160dcc087b
 EBUILD tomcat-6.0.33.ebuild 6961 RMD160 17c4cc0cd1bf9b681f612bf131f34440e1a67bae SHA1 1dbe88bf2615d57add8e0deab2074d653a7423f0 SHA256 ae706bb3f875113fa03dc4e9770cd43b033db449f75bb3c76e7bd9b1405c2036
-EBUILD tomcat-6.0.35.ebuild 6985 RMD160 222068dd73637edd5fcf87d6701b87acd9f951a0 SHA1 fc95df955b8244024d8a78ec973f0f6b0e2f8af5 SHA256 37030d5aa5a1b496c29e0396b27f96f9414c979ec90493c6f053647db56b78e8
+EBUILD tomcat-6.0.35.ebuild 6991 RMD160 c52df23256dac9d51b9d4628b1baa390e24598fd SHA1 7e8f3d06f7bda4e5e451f4f8977d2e2982dd9111 SHA256 005a5291960908275e519f4fb5caa8a38e789093cee1b3af1ee5363e19df62c8
 EBUILD tomcat-7.0.23-r3.ebuild 7637 RMD160 0a40dd93603cd90f509a56d6423479eb9c79fb50 SHA1 9a641167acd790bed9f2ff40719825f22bdd921a SHA256 a36ed1d12064874e62842f60e3873260b8b245a87b4201b6ec275a477ab0dbd4
-MISC ChangeLog 69471 RMD160 09f900a5b2c088ec1748a5f9758aaa5c5641d745 SHA1 9edc09ca64b5aa509458b720a9a3b5462b39b89e SHA256 842b526d649832042d6272da06f1349cd79c39e9f63e03871df548b4fa8177ca
+MISC ChangeLog 69580 RMD160 5cdb6d464d380b74248b8c182d7c81d1fba1bc62 SHA1 c18fad38a4d651ae8c6b31b31008b86c0748fe91 SHA256 262e8be007ab1887a9d8f64a84d6e4a214d8b8b69b6a7d0d67378aeecc19e067
 MISC metadata.xml 451 RMD160 965e7cb85fbf383be678e48d2ae0cdf7b4247c99 SHA1 9b3717d68fdd17b010345fb0a63ad9aa0126dc42 SHA256 b508f373350a4e92bc04ebafa528a5c50eac8bfbd67d2fab6a4fa82811d1f109
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEAREKAAYFAk8Ek5IACgkQuUQtlDBCeQJ4jgCfdAo0BZwOTzwPEx7ixDNlNywj
+220An1Hpm+o7Ck8sFQnPon+FkHiLO/ey
+=hW8p
+-----END PGP SIGNATURE-----

diff --git a/www-servers/tomcat/tomcat-6.0.35.ebuild b/www-servers/tomcat/tomcat-6.0.35.ebuild
index 164d5ea561601371a764510a518befb223c586e9..b003590e1f5c59dfd362afb096a0ca2da96a39ed 100644 (file)
--- a/www-servers/tomcat/tomcat-6.0.35.ebuild
+++ b/www-servers/tomcat/tomcat-6.0.35.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.35.ebuild,v 1.2 2011/12/24 22:52:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.35.ebuild,v 1.3 2012/01/04 17:59:40 phajdan.jr 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=""