x86 stable wrt bug #539596

Package-Manager: portage-2.2.18/cvs/Linux x86_64
RepoMan-Options: --include-arches="x86"
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 19 insertions, 6 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index c6f38bb08459..014d704d7f2a 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.344 2015/03/28 15:54:37 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.345 2015/04/19 09:44:25 pacho Exp $
+
+  19 Apr 2015; Pacho Ramos <pacho@gentoo.org> tomcat-7.0.57.ebuild:
+  x86 stable wrt bug #539596
 
 *tomcat-8.0.21 (28 Mar 2015)
 
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index f0ebacd55d60..9d88d95e658a 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX tomcat-6.0.41-build.xml.patch 950 SHA256 33af0fd388c439e3ee74fd2271d94066169b530b61dab3f1f01a094ec22e3f9f SHA512 69775288f3ba31bc5b3f1f6125c1ca6f27c64647eeeb40928227fcbeb3a33f832ccc24be051efec9f8ca575475549c6493b12495d4a98e9e4fd1c27b9af68f8c WHIRLPOOL e31b35c1395c152c65863cddd79617ec92b21269567fc1458914e6f9b10e3a70698987d05724e52b706e6e0cfeab56e818feca5d04d80ee08f24bfefe89ea63f
 AUX tomcat-6.0.43-build.xml.patch 950 SHA256 33af0fd388c439e3ee74fd2271d94066169b530b61dab3f1f01a094ec22e3f9f SHA512 69775288f3ba31bc5b3f1f6125c1ca6f27c64647eeeb40928227fcbeb3a33f832ccc24be051efec9f8ca575475549c6493b12495d4a98e9e4fd1c27b9af68f8c WHIRLPOOL e31b35c1395c152c65863cddd79617ec92b21269567fc1458914e6f9b10e3a70698987d05724e52b706e6e0cfeab56e818feca5d04d80ee08f24bfefe89ea63f
 AUX tomcat-7.0.56-build.xml.patch 3854 SHA256 51b845985859132b633371c6fd2e1e2ea5c787bf7206125546c4b8752464d39e SHA512 8da59a51e58db16b0062bcc6b24e6b0b43d13884abd7c68a37b15226ff4184fb872a8e43ac281c3c7bd379dd11a1343db3eff84175f9323808d1d0c8641242b4 WHIRLPOOL 6035466159f30b873117478a8859451d73c4424cb22e29991cec2af72fc918cf14adf2bb51d107a7a1b95ca1b770f7a3ba6290abdb036d1bdf1a9a4b8da75130
@@ -21,10 +24,17 @@ DIST apache-tomcat-8.0.21-src.tar.gz 4894606 SHA256 9fe0d4f0f86593a78eec952b257c
 EBUILD tomcat-6.0.41.ebuild 4100 SHA256 f6670ad36ebe0e33e355dbd48247498f0442375379dfd07699898dc017ec735c SHA512 a9cd92dbda03655749ecab0b18859c9b675da10cdca481c4cb5a817264a592fece1918488900f5737eb54e8a604ac6f1147818ded09cc7e9e95454e466ea0322 WHIRLPOOL 2238288feeeec4b2f24ade1606561d48461b5d0cb1d9996c03fcbf3e2a3474c0cfa0c54c876dd5e3a29e20d3015a370affad2df20bdd17d8949dbf7149fd5d61
 EBUILD tomcat-6.0.43.ebuild 4109 SHA256 5577cf55a7ca8cabd213e62178c81ad6e98b7bdde8da7c1d27976d72c1514aff SHA512 782fd83b71db4a13a9c9247c3773cf0674a507f5332c7dc61129c4217b013b401621c4c233e9534b49f0713be54e2018aed6a604d54e9986192044b3b1dc0cb6 WHIRLPOOL 37e7b8cf12c98a74c43db448d4ad0bfb2b7299df44894552fb52232e3c52997ba79f335d175b2eb488d075168e4115ad87810172677fad3bf9cbe6b01cc86331
 EBUILD tomcat-7.0.56.ebuild 4365 SHA256 97276b1e8550dc3d8b3605d57e744a76930c056dbcba21ee83742e8053cb7a52 SHA512 f3a968f5ed7c04e5752a0749467767689b5006ada49848aac02d9ac977ef2024d21a8ea5fcae2e1f609f5faab99b60c35ee084a01c961c668d031d0554650b78 WHIRLPOOL 81f7673fcf5c09cf3f705b748fcd7bc35d0d73672ec43af8e333b8e84fcdf8128eadf269e9835cc6e7da1e41478b4848572a6a6682c55026aba0dd457946f507
-EBUILD tomcat-7.0.57.ebuild 4349 SHA256 6fc213d477109c9438715922d2f86ad4b2e208ade3f5094cb308832377ce3a91 SHA512 9e37119cde5bce1fd15c8637e779ecbcd6aed21000eaabca2f1f67f6c17085379e33b364878e3e23c994ef8990edec20ff20c59f5a063a4fc8e38b7a7fed670d WHIRLPOOL cc6ebef82f783bd44e7ac5573b309ca65d67eb0df5675ddc454155603326f4d60c7503fa46c823c9213adb6653460750ab3f728a6eea97b04ead034476584440
+EBUILD tomcat-7.0.57.ebuild 4348 SHA256 97e7d9865d547a70d746553cf104495378523b30dd1999616a095c0592074aa6 SHA512 268ff13f57c47faab8258769493cb5d753a2f9ffa9ab2fcc4425475190a5dc6e8de34655541d61a4f54b69f791fa787fd1d8537da359e5e2c3bb183f7308b552 WHIRLPOOL d37e8495b3e979105b5bc0dea61960ceb46bafde02e7785b87aceda431ab9bc06d2eab7e11fc0f40f5f9765a07d2dd838a2852a59fb1b4b1e4fa34eec001ffe0
 EBUILD tomcat-7.0.59.ebuild 4352 SHA256 139c44589a83570efcbf9c3ac00d0da77d91be2fa9cdf4f075f007f8cf63dc6f SHA512 2d96e0b56fa306c832528ee7baad071ba3f2d3cb274a62d070e164ce51b7018b50c110784f842b302df0f8d00ee0d05471e17e5c298e6bd8a9018b4810eb6521 WHIRLPOOL 6f6a5e9652ea117e74c11a980934b20137a67c0295392de75818acc23f974b0d7db568b9b92ba55117d482180e5377252113ca1d9204a89f04e878c99b819b2a
 EBUILD tomcat-8.0.18.ebuild 4182 SHA256 51f609db4de52c4e8005c94247f805bac85ca22c4915606644560646702630fd SHA512 13f004ab14cafa7e23b0903170049768b3c901cb58f76804afb2d9b1e424079d8b1d2a75fb33f84aade46f5843a456785da31579edc78c102fd1e3fabf85a2ab WHIRLPOOL 3c2e16cf60250c3b476b0be6e8c3237814ae1f119411137c7cdaeb7c2a703a02535bf744a6b4912bc8e7a6235eca51d3ce367c2895e297569fa25e3d185aa68f
 EBUILD tomcat-8.0.20.ebuild 4182 SHA256 859e1181db68ae0bc11407fef3cdd4e94fadc086d50a7f793013e877265d4967 SHA512 27afb7bb308f3e708c56ffd59cb1c769547ed332935e4867dd3e6daff605b9934c6b688dbfcc034acca36fc6f2fc4aa5357769cc110747ae2d627c78b80c36bd WHIRLPOOL ceb8e1e9b30485d1e76684bfd1d4adec0dbafb8f51e60fc3dcc7374c68aa214b83634d8331bf8ebe50f0d6da72937184b460394d7fa121a23f6fda75788027c5
 EBUILD tomcat-8.0.21.ebuild 4182 SHA256 2eca5c95cd568475b7ceba3684ca0109f99321563c5cac9b8f8575320a877e1b SHA512 ceedb0b5f4b7f7601b19c6f220fce5e4b1a0e3d805170aaa818790e67a7b714d3c7777c6386fbb21b3291bffe03ed49da27271eae932090323132d3d6c8acf6c WHIRLPOOL 2c795ee6fd2983ed02870f31a8e90aa99856ddb315956a813870e3600b53339eff6beb53b6be1139b8f0184a49d5db42827643f4d4a86b47003f3b9f58995f38
-MISC ChangeLog 81696 SHA256 ba9113d6e6e508b092ff163489c4ee5680e9186c2f8e5ba240375a1f071587bd SHA512 f9ba9590fd83260433cb7d87e05abf4dfd20b002eb36fb25cdb57a59251bf9c4fd4b4d042d57852357469c3137944ea6a7b6908bae4aec296d8265042e768198 WHIRLPOOL f549ef29eb44aeaf30a3ada03b8f09b070cffe729f7f1a4d5f4d1ef741517562a2532122ee728b400c2c045feec9bac0d6dce1308be5f7711b2771a134004a21
+MISC ChangeLog 81791 SHA256 535e966bbef93a8ca48119e933b612e59d71d1982cf38611fc1b0df7d259a4fd SHA512 739db600bbd9f1c7f7dd7c42587b9f682d7422ea4c294e9f54e98c035b5c28c0e5fbc50dadd9dd8b5b29022e3ddccdfae19aef4b9ee48037cfbb9d4510b993c7 WHIRLPOOL 7d03d2ff3d9d9ebe5fc63673da4093fabde17d34eba095355d6293f2cb907e52a59eac83a4267afd6f53b1c0007c3a76132b7d74acecdfceb5b08b8f678261e5
 MISC metadata.xml 652 SHA256 ec9dcba0295a5c3eff6b20d7d8038e09c6438d2fc56e45b5cfc3c27206f4bfd8 SHA512 07bc791d1240d11cb34a117657187a9efe4ef4bcdfee76d99f9656caa6fde1c1ffb67b78fe5e552c2a44ddb7e595d4175ada50f0426f2b0d832f0162f6b0afac WHIRLPOOL e1cc5d3799a6b7f6249f5c1420248600b5fec9228dd803fd673b1a75e26900c6539222a1da07e83bb4560e17681ecdf9ff31fe5dcc4d0fb15a694e9402991d7e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlUzePoACgkQCaWpQKGI+9RVzACeMR9ljjBL7aKsVOooqvF7Msbn
++8EAnA7CydLDFmZ6C9L575lnW4wRKSyI
+=QH5i
+-----END PGP SIGNATURE-----
diff --git a/www-servers/tomcat/tomcat-7.0.57.ebuild b/www-servers/tomcat/tomcat-7.0.57.ebuild
index 0e86403c04ad..47d269a60750 100644
--- a/www-servers/tomcat/tomcat-7.0.57.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.57.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.57.ebuild,v 1.1 2014/12/14 11:51:54 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.57.ebuild,v 1.2 2015/04/19 09:44:25 pacho Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="7"
-KEYWORDS="~amd64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~amd64 x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="extra-webapps websockets"
 
 RESTRICT="test" # can we run them on a production system?