Stable for x86, wrt bug #549536

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

4 files changed, 25 insertions, 21 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index be08fdc00fee..0057677eb13f 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,10 @@
 # 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.353 2015/06/05 08:59:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.354 2015/06/05 09:00:08 ago Exp $
+
+  05 Jun 2015; Agostino Sarubbo <ago@gentoo.org> tomcat-6.0.44.ebuild,
+  tomcat-7.0.59.ebuild:
+  Stable for x86, wrt bug #549536
 
   05 Jun 2015; Agostino Sarubbo <ago@gentoo.org> tomcat-6.0.44.ebuild,
   tomcat-7.0.59.ebuild:
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 1ce930f0e7ec..7d70035c63c7 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -23,28 +23,28 @@ DIST apache-tomcat-8.0.22-src.tar.gz 4862888 SHA256 a7f1e511e10019217ec2ae917058
 DIST apache-tomcat-8.0.23-src.tar.gz 4868650 SHA256 6293713e78da9bb803060c8ddff982f8f7aef5a2e4b325340088493ce9957ba4 SHA512 cc83194b2847fc2db5448d548c7e65a1198cda02726b070f913a762d324152315886fba09532b879e26d15ec57e04057cc30b3a686b2a2307d6447d17f84e16c WHIRLPOOL b0559a4ef1b4c1f0683e4cce976d31db175d3c4f4d2b809b127e1074d49a6bf764366cc3e91f9a0818afd6de35e662a7aab89866dfd2e61673327c50535bff88
 EBUILD tomcat-6.0.41.ebuild 4106 SHA256 53fd6a42eaf1de8a0a327831a72aed4d15a07eb272edf2f28c8d9b94d6e021ca SHA512 8a3df48f5d39a6902ffc123e4cc674f4362c110470afea39ba5141025facb296c9cb0de05c05901173e6972c0b114cc7f0556956a696ad304c7c8e5ff1ca46d1 WHIRLPOOL 9d7ab44f71916efa4ac4916ce68b66c1e5842abcdff3635ec44f4b9b6e1ce8df1b6e796a19ab38b4b8615504cc27ca4183a5101a893c9839b02ee1e74b960c5c
 EBUILD tomcat-6.0.43.ebuild 4110 SHA256 6363592a6e1243af3df13a463b3487f53e7d1bee2fdbc3d82bc52b8336fe75ea SHA512 b7640ec1842d5220ac11e36930f148f83ad2647bb89d1a03f226e968a1928894d45d008cf89c64840760a1d1269613adeae92b0b1207b934daf7a42fb1791386 WHIRLPOOL ba8c19e0f53ccf587242a6d25eec82eb87482a553e707eb86a5259bf0986fe604d072f10b4c83bcc48643dd363116f72eaec7a5d135f61e31e863a285f52f7a9
-EBUILD tomcat-6.0.44.ebuild 3984 SHA256 f85d8532151ca4928cab28635cf71d5228797362974f8ed10a11ada12c2f7c56 SHA512 c16ce585cf85133ddb0e82bed432455ec72657a2828dac95ec0537fd5d689b54f887dc288653272d3a33455e1e3723058af74e7a4b24c0e48b3c5bdd1f61f360 WHIRLPOOL 72fbb5740785d3ad231342c0224a152c143556fbfbd016ba24a6ed944a495dfd1cf5ec719e45a99cb3ec172596ad396d3de2222a135f9c058360c8d474b572c8
+EBUILD tomcat-6.0.44.ebuild 3983 SHA256 46e6fbc8d69036bbac3aa9e523e4dd063bb747ce6258adbd3f95318c37024b16 SHA512 23ce9e2d28a2b51ada92e22dd4c388d03425d6f666f2497bc7230d45d31939895523635ee9027f9ee460eece04e08ca8165c5461f542662e5585a666868a18a2 WHIRLPOOL 7b5b668d8f944e7a6aeb4e7acd176193b005378822593ee928af870fee0f35ff98955942ec8fda3550b9d0299e0926bbf6014aa4071ceedd9e8093335f0f5676
 EBUILD tomcat-7.0.56.ebuild 4371 SHA256 db945adcb5004588375531121daa5082637efc30fcceae9434633aacaa4e604f SHA512 079428d37e46adfb8c2a5b243679dec148703dab9cc62349afac867423735e492ea369dd67efc614c756240479cbe5333b057ae38a8fc7d1cc13fda818fd9eff WHIRLPOOL a676f331cf55f9f986adbcd4ed1498494b4bfa58b21a606baaa0219103d2acc740dd318a1eecc9a706ce4b294624e6b211b6ca40efb0a12ff6c18dbdf49eb12d
 EBUILD tomcat-7.0.57.ebuild 4352 SHA256 89ff2b254a4b023229b5029f0c7faf76c7d84a33adfc95ee474434a24282be4a SHA512 ea9589065bae4f00f049d9cd61df5410a72ce53f006a09a269dbd2356e625a0fc2086fa52bafe277dabb417c3e0a84e7a0608be4f3de9ec6ea5eb9c7b3511c04 WHIRLPOOL 74f8c008f1bac9f62f1f390f61f4229b07cd075d7494f2d5e3308e41081c44a6a3a85ca32e89d44dc7f56466cb3d5cdf6e84db204c0e526071c94b0585e332ab
-EBUILD tomcat-7.0.59.ebuild 4346 SHA256 142168b496d53c33e4545c34e5279240a7abf55fe5db028b1bb3961190dd6799 SHA512 0bd3e9c9d89795b49e7ac3f0b5f20d1accbfcc93f4db9b0903e73c498e4cc37f86a2f69b8fddc53287f14b8b40f345f06b7a95f69b87dda4550ca6befe644937 WHIRLPOOL e38ce80af2226affd74fa94ac6d41bb5f1a67124a0bec181247ac83d18f732bded861ffa64078c8bda17208a91072fb95c482fb64b494cdfc05f8fb66a22ff23
+EBUILD tomcat-7.0.59.ebuild 4345 SHA256 8d03c1c11c22ad8ded23d70d41ef2d4e2dc05b438cd601245efa97b01179e94b SHA512 c21ff9bd51d0e1fd39219d9a5f0d74b6015384a81eae569da6e15ad4641b9c57d117d4a7e8ba479507c84280feb6f13bb5633e69d6f92828b4adb6bce30effb0 WHIRLPOOL 957d5b4bee5b9c4ba1bc64c7649181420cfc7c32fa34f61773cdd3ba942d226096f2f02ce203ce3471c1cd3416ef50f61d48acd501389a564c04093a059ae361
 EBUILD tomcat-8.0.22.ebuild 4195 SHA256 2432204f654fdaf8b06c756ee85368ce89673ff474d166b44a93cea76eecb78b SHA512 28a0c3589d5c59b6e95746f0a3cb35c6875345d8705ac49f9d7c18313a8bba7450e85a474f651bc7b848eda509bc0b74eba3a0a9c60478a78f5ae55ff9f0582c WHIRLPOOL 4c96d6071d8bcf4a25d9ddff4acec3af01d527219fe0a87492b5f84ab100930357dcead1a0a2eb4c66637a6e0021faec247d53bcd61330f8c5f6b650e67dd707
 EBUILD tomcat-8.0.23.ebuild 4195 SHA256 a3d63d0ac2e032f06f87e8be7c6dd6205e25ff090d26e2a4545b13c15027678c SHA512 632113159f1bcf2ec364ce4d4d5774316fcfeaab1f52101ea1298e7aecf5551b62cb291488f594edb6b2b040b60eb3856f421cc3f45fac4cea88b94e5af141dd WHIRLPOOL 29aaa1db8b67f239c4b271a7d277b22179a6ca4dd3490c6af51ba8585a3e4c862236d6250c3a9244861755f47668b4caf96bd7423ee8b96b1c91e5e8532b2c95
-MISC ChangeLog 83732 SHA256 818077f8e730bfb3301a45ff0d02b8641eba916dfff76aae8866769ee70b82af SHA512 3b89a7dd1f5ff6774c79cfffdf3af3b4292540c3e5713a673eefce1a14117f098f6bc5b4e2d1718b49f39def314b4287f3b59bcb6d3e0b7e2f0f34004e37424b WHIRLPOOL 7ffa86fd32a78a55d98db8d987af7007591d6978227d74786c3bd89028412095da6a0dc8dd447cb6e8e5ee1ccfbb81477fbbddd79413819e168798af8933d781
+MISC ChangeLog 83862 SHA256 1e8ea89bda49d58f30832dab72e0c4817eea86bd7ec32bbd8f99be8343cc2d84 SHA512 3b342512b8d60c11c807a5a2e935792f83e3124c2605e049465502f8646131141f7d600611553a41bde16adc42fa92e2654435d9d02cfd84700f5aad0c4df4e2 WHIRLPOOL 8619ad009370e1cbea2dde9eecb066e128779755ac0869cc9f2638637e8c9b24b93bfe8e997808e45b06759b0a84357bbd83384f650dbd8a6e7dd5a3e99f373c
 MISC metadata.xml 652 SHA256 ec9dcba0295a5c3eff6b20d7d8038e09c6438d2fc56e45b5cfc3c27206f4bfd8 SHA512 07bc791d1240d11cb34a117657187a9efe4ef4bcdfee76d99f9656caa6fde1c1ffb67b78fe5e552c2a44ddb7e595d4175ada50f0426f2b0d832f0162f6b0afac WHIRLPOOL e1cc5d3799a6b7f6249f5c1420248600b5fec9228dd803fd673b1a75e26900c6539222a1da07e83bb4560e17681ecdf9ff31fe5dcc4d0fb15a694e9402991d7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVcWTdAAoJELp701BxlEWf4m4P/1yQXZm1gn3GujLbu5OAAoZ3
-FL8mTCv/UWN1Ef7PB2KaLZem4YmaiCpQ6sjwMMV7vA3ax8yhLjWMFIMUI2179nwP
-IIdYXQOkxziiQREXz2NXWd0qnOOMRVk61kaf4UcUdNKyVAupaQQw0cJ0mGARmwqD
-oA65coXuAYHjAc9Tc87I9+PPzgxtY+gEEjGkI0CP2P/PAw33NMW748FdyLK806IG
-X33u6GYpXzw6v9T+kDVkQBMqEbLoaew/GtHOMvrxKK5wk1HTFGFxlsSeGbhRjWVi
-LXk9wq5Y+bYud6dTs1ZwMNYmZv6Za5eTrr0CXj+81Ux0VqVBNU6w1jZNQi68gHW0
-hSw2Y0XqTkTU1fep1dMdxLzLClLMaO/1R8lHJKnWHrJjKxhNMy1e+BB624V2zll8
-mbwUyADh4qWO2R1XNhTh3NhCrJK90kO74BXL5vAPyM6SA2p/5/uW0ZTesuqjTQ5C
-0SPxQ+cAQhxRE4ChSThGThopZgX4wQSSDmWwOpBCnLxQbhyU72zjYn7w8GBKHFB8
-RRuM2q1NfyndwYCfYeMA8YCUgo9MlpeRLN8k46r4bAV1UtO2r/UAgo1AahkI69JG
-hZnwzZt8fQOXvkxeU7Mp4wxogjvRWJhxgjmMAjml1jIvZ+ZV9aeWX6iT7+zfiKnH
-pX9akzbcQ4R03jI8NoIx
-=qySM
+iQIcBAEBCAAGBQJVcWUZAAoJELp701BxlEWfhaEP/0ys2bOqwefjVPvn7aEjti45
+CMTcBrcEkVu5S8VPcM23Uonn+Uj5/srxZu4Qn/lTC5FzZSN+FsoMnL5zmtSLUyB0
+blwzqWD16kMKcz0d973Q+QOLek8unv328f7x2QNNp/pxYRIWGROLsqn5kgSmGNVU
+ImTa3+8o9JQB0mMPgIn7mH+0dPCwo1GgYbZMneJIruJtChlLHPRQWvu2uKRC7B/y
+gB2JIIiQ8icdeZJz4DNxsw6ODPqOQw0HjM3jVK6/gqDzmmayOFah4KTWfOxxdi+i
+nBdeD/0+A/qpCXt36AMJ/otS1+MPvsja/I2s6uVq+wlB7VsSC0wW47ai/SdAx4U8
+0uKlqO6jOc62UQZAW8lkpnbzRxBIhSybuzIFYlKXQ8R/q3o27A1g/xR1a0D2V8KV
+Qd+8XUc5O+W+nSxN2h2++EYze3bynIN9aU5CMDxaiXWFKud/dOj0P0oPoOoeK4AX
+P/33MVL6q8Y6sUEz3IVX3ag7Y3tT/FXvOjVvoqxMhIZVFmlumWXv5dP/NpSfyuIr
+Ggrigl3o34hjcF4svtmS4oYcWjORma5sqk6AMIG6ZSYUYIUCo9aDE37FFPGXhvVY
+dioYqBwZwfzJ5vQzhRBI3BxurlS6ppkaEmo6nwFRXVzNndzFgU5YaMYj75CaCeGC
+niRkezOXuIeaDocMU15G
+=kV9c
 -----END PGP SIGNATURE-----
diff --git a/www-servers/tomcat/tomcat-6.0.44.ebuild b/www-servers/tomcat/tomcat-6.0.44.ebuild
index 75eebad4c0a8..841164406e91 100644
--- a/www-servers/tomcat/tomcat-6.0.44.ebuild
+++ b/www-servers/tomcat/tomcat-6.0.44.ebuild
@@ -1,6 +1,6 @@
 # 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-6.0.44.ebuild,v 1.2 2015/06/05 08:59:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.44.ebuild,v 1.3 2015/06/05 09:00:08 ago Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-6/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="6"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
 IUSE="extra-webapps"
 
 RESTRICT="test"
diff --git a/www-servers/tomcat/tomcat-7.0.59.ebuild b/www-servers/tomcat/tomcat-7.0.59.ebuild
index ffaf92ecf58f..3f9c01b94996 100644
--- a/www-servers/tomcat/tomcat-7.0.59.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.59.ebuild
@@ -1,6 +1,6 @@
 # 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.59.ebuild,v 1.2 2015/06/05 08:59:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.59.ebuild,v 1.3 2015/06/05 09:00:08 ago 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?