Stable for x86, wrt bug #458890

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

5 files changed, 28 insertions, 24 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index fd94233e9fde..5b4448c25934 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.364 2015/07/23 09:07:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.365 2015/07/23 09:07:57 ago Exp $
+
+  23 Jul 2015; Agostino Sarubbo <ago@gentoo.org> tomcat-6.0.44-r0.ebuild,
+  tomcat-7.0.59-r2.ebuild, tomcat-8.0.23-r2.ebuild:
+  Stable for x86, wrt bug #458890
 
   23 Jul 2015; Agostino Sarubbo <ago@gentoo.org> tomcat-6.0.44-r0.ebuild,
   tomcat-7.0.59-r2.ebuild, tomcat-8.0.23-r2.ebuild:
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index d799d217e9bd..9db9e879ecda 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -12,30 +12,30 @@ AUX tomcat.init 2989 SHA256 bae9e2663e5fda9c665fc97e916074cca46468560af17e3bbad0
 DIST apache-tomcat-6.0.44-src.tar.gz 3447711 SHA256 c6f01526d58f2ba7b9da496e959d9e68cc49183006077704ab91c36ebebf5a4a SHA512 0d6a1539b28fa8ca3442557889d7d21cc523b18136f6998820ba13f41420536aba65ce78bac526002ee1dd86df3cbc80d9f043a3f765d7cf0b79e58e516030be WHIRLPOOL c65e704466191a0f98ec777e95dda889599ff6a545e7c013fd04bc0b72e0d0edf4491415f243d6a4de60cf76abe5c13ffbcc6d98f78b51490f7b7b43b24ecb97
 DIST apache-tomcat-7.0.59-src.tar.gz 4687344 SHA256 3a1dedda4019db87464fca3aeb4e800a538f0baee96d8b14c9d64967b0d2ea44 SHA512 acc322eee1446dd1bff72910ae9f40a62f88332ee69d6057b3c684e2abf8f28e6df6ab9505900f0b0cf7a5e2e0e80e64b0a790b3b78594ce595ce897706b4bcb WHIRLPOOL 4948964c1746e6ee912ac72c901ba271793610f402bf082455d104e2e8d6dbfa0bf5371d42d48d8ad7c826271fa60d989119a01e700497099022d0cf3564fdff
 DIST apache-tomcat-8.0.23-src.tar.gz 4868650 SHA256 6293713e78da9bb803060c8ddff982f8f7aef5a2e4b325340088493ce9957ba4 SHA512 cc83194b2847fc2db5448d548c7e65a1198cda02726b070f913a762d324152315886fba09532b879e26d15ec57e04057cc30b3a686b2a2307d6447d17f84e16c WHIRLPOOL b0559a4ef1b4c1f0683e4cce976d31db175d3c4f4d2b809b127e1074d49a6bf764366cc3e91f9a0818afd6de35e662a7aab89866dfd2e61673327c50535bff88
-EBUILD tomcat-6.0.44-r0.ebuild 4130 SHA256 ddffa21ae81be496b1596285503b5e3a7b601eac15644120e91156e873b98608 SHA512 3d5d54c94b86ee0da361544db6e58ecec9413cd8a115f9bd3af441c3dd587d3cf3fe4a5e0b481dac829e0fef30ffafca60bdeb9acc3c8b881d3879f70c2ae959 WHIRLPOOL 9b8e7300e341409b8fd22d90d0c04b92da21b0ed908868ddeca479d792cbbe1568ed2e5873abe854c84b2b291bc127028df905f88356d06a87a248da2b481339
+EBUILD tomcat-6.0.44-r0.ebuild 4129 SHA256 1edfaccb7e3a15764ff913888b935ed2faa05667f8f1fdadf488dd66ab6fd580 SHA512 0fcdb05c0028b854c23f96f251827b7047f90db6e48b73806d1031c481ffeac020e1d348b2465dbe63de3f9df950984cde1d1d5e14da3be96471f8565e93f0b2 WHIRLPOOL 98f899771988bd79865ab8043aaa2882b0967e9f87f8367f48af2bd1c0b1d0c3b79ccf3c478b18c749affcbb0f98a35e521de0f5e4a2ba194ddb6d49ae92d2eb
 EBUILD tomcat-6.0.44.ebuild 3981 SHA256 9c9c65233de3f8b3c67fd2284596ddf11ffa909c8ffdefd3fae6740d65e077a8 SHA512 895ff3b45dcef71f111842a36e40267e913ed5182a448fb2dd90584d318b8b4404adbe02225cc0fadf7c3b59ffd26ebb27a8a1bf67925eb18b054e2fed09d6d4 WHIRLPOOL 1f6a81f4f697234f5615f51105d24998b3f813bf4f325cff1e1ccea2283ebfdb0babe00bdfbd6568d8964709f9fda0a7d0d0cc76a91ea875a599087fa3a8d66e
 EBUILD tomcat-7.0.59-r1.ebuild 4306 SHA256 a7dd95ce7b6c35363cf9097dfb5f28f4f562347e396b9ae1169ec0e5afa3c25f SHA512 be8762dbaa0ce6bc566c394d87efa074737a3922e249b462b9d4d6c92caa065c1264f9cad5e15fe7a20f0e2fabb298a710ebd9ae64847270ef1823d8441b7171 WHIRLPOOL 0575b329b1418f4328bd34b2fd2ac8770c5b3036d878d2a88083900507647b27683cb29c1036c4038f4782d36bb8a18da5e59cc5bc3321a4f14b2e2a35dfc844
-EBUILD tomcat-7.0.59-r2.ebuild 4439 SHA256 02288b82d4a6670603e24177f5c7695eda04708ce8b727b7f58a9928cd064273 SHA512 1f0d28b4b1f1e5d3bf163205168dd0e841000d8700c333700d1a6c028a9caf11bd197195c624a2db1029b29294350bb1a96ed8e1933c5196fa84db59eb811924 WHIRLPOOL 57aab4ad57f5319349386e116f070ffa9979823dc223b10058b129e13870489bfcd1b39b9f7b186de9ed24931fa45298ace12c7c1ff8737bf6f166ba231aba04
+EBUILD tomcat-7.0.59-r2.ebuild 4438 SHA256 e861c2a31bb425eedfe708621dbb405dfdca9eb39645a0d823c5d6f220f25cf9 SHA512 9d665b138ef6641d08670c497e6735fce34df97e8e2c64b939da6804e6dd58503193e5ea83ad008026c71271cd6da25adcf359bba9e20f2a196822f11b2896d7 WHIRLPOOL 39e3cbad96d96e262c3bacad6efd8628152da0858eac11aae0287335fcb9fb9bc9917b26d34c3cfea9d3da2164d36c150753eb50876366cad901ee5b6440130c
 EBUILD tomcat-7.0.59.ebuild 4345 SHA256 11f5537efb984d4efe48e003ae205ac065f21ac9301f5c9fc8c48697e227a348 SHA512 70d5eb906de80e6bb6abe754116a1f648c7574b5f9aab1a4be16c101ae967767e799a95bd80f7b463e2dcde1750a4a7b4d8c1ca844b6f82cb027e7964f3cfe8e WHIRLPOOL 0837948d1a57a555207c1264fc9c140b1e35fb2503f9163403ace593cd5445e58e0a195bd863665a527a740dd712faea484f1dc8a6da60ceb18a3703a9a41828
 EBUILD tomcat-8.0.23-r1.ebuild 4153 SHA256 da6b77d97c1ce9c4358080edd1682ed86aa5e265acc7eecff30622cccd95d0f8 SHA512 083f04e9f936cdbb5ef9b591ecbce56423e5bf50c8e86aa26101b86cbcd0bb7dbc7da6f74c785c4cbb4038f12353f114f31e274ac6897ae9a9718646b0a7e8cf WHIRLPOOL 30206000dfca5c5522e4bb0f8da5a2b3edb94734766eae25580e34c6ed9efd6b78cf8d3bbd633315785d2d7c4500e9a73c480f8a75f0a6e7de4f994a420b9cfb
-EBUILD tomcat-8.0.23-r2.ebuild 4273 SHA256 85f33facc6757f99379f296811efbdf1bba9aee49ba289a9b45cd36697e79343 SHA512 1997c2650a78946bfdc155c993653fbdea9bb9584f9b52c92cb164f29988a1b0bb8c392dfb3f430838ceb48ba693ff36ab035acd95bcf436c885dece561cdfd8 WHIRLPOOL 0256466910bcadc7db7f6d884b9c590a0f30c9610d775ad6bf1a1bc8ab6b51310117e7a375606bc32de2628f080f69c8406511bbea6b37cd75c66bd7280cae9f
+EBUILD tomcat-8.0.23-r2.ebuild 4272 SHA256 c5ad44c205ecd304230510e24a36edba14cc2ac6e9785308bd1f76e69117df4c SHA512 f699e9fa15b8aa3e3072f2f3fe87526550feb271fb5bc05051a943aeb7658d0415f64df9f23768d1f65bf8bf90c9e792ec7ad5f401528df61e4fc7431d082ff1 WHIRLPOOL 61a8c27a33fbf95a4a8bf3f44e96138038fd8bfdfade63268776716c540174543b4133a8211cb0ba8c2790406eaf6a19ab08877c3d55d3a2ab53bebc155d22cc
 EBUILD tomcat-8.0.23.ebuild 4195 SHA256 a3d63d0ac2e032f06f87e8be7c6dd6205e25ff090d26e2a4545b13c15027678c SHA512 632113159f1bcf2ec364ce4d4d5774316fcfeaab1f52101ea1298e7aecf5551b62cb291488f594edb6b2b040b60eb3856f421cc3f45fac4cea88b94e5af141dd WHIRLPOOL 29aaa1db8b67f239c4b271a7d277b22179a6ca4dd3490c6af51ba8585a3e4c862236d6250c3a9244861755f47668b4caf96bd7423ee8b96b1c91e5e8532b2c95
-MISC ChangeLog 86029 SHA256 2f7a22ed84945524e7ec02332a8e0c2248263cf9f1d38823e92319a433f10ebd SHA512 123d8bbf0818339cd0b469a5ab9438387d1c19d0a35a41ae4739d9b3f2082f0c2bdd6ae56a7792ec3c5796f6a998460de70796389b9327d563aa66b6895216d8 WHIRLPOOL 8c61649a5955b0eeb2f0fe76d5288cae664f1ebd10fc79003abb6c0fdf0536d2498e302d10c12698a6ecff50bff9eb9c50a1564292e2a1753bb786c9051b39b8
+MISC ChangeLog 86190 SHA256 e5f4ddd6e9424e8bf47cb9e3cb7c2e7e6fa8660e13e323ee2c7434dad2df885b SHA512 b17218c8be0d6a8d2341cb74b48788240cbffbb977668cad64c4b2cf330c6b9b122ee0d876c36cf3ad22d248b474799a201da01e66490e121d55bd7f6cc47211 WHIRLPOOL d541a790f8b090387d6705562b8c1f8be1fc12b94b0eaad1144eb03f520148662140fa913f61ca5cd8d612322dff6ea2e5b6a45e2e5cc217595301fdf4f0a1f0
 MISC metadata.xml 652 SHA256 ec9dcba0295a5c3eff6b20d7d8038e09c6438d2fc56e45b5cfc3c27206f4bfd8 SHA512 07bc791d1240d11cb34a117657187a9efe4ef4bcdfee76d99f9656caa6fde1c1ffb67b78fe5e552c2a44ddb7e595d4175ada50f0426f2b0d832f0162f6b0afac WHIRLPOOL e1cc5d3799a6b7f6249f5c1420248600b5fec9228dd803fd673b1a75e26900c6539222a1da07e83bb4560e17681ecdf9ff31fe5dcc4d0fb15a694e9402991d7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVsK7cAAoJELp701BxlEWfG4AQALLu91NUdX5GkWJQIBNQuw0x
-vBMcJEiAWUk6BSCNavEJFcmHcy16NDVk36O/0rLBFYC9xzFTx7jr7BRZDfHo9R7v
-1zOyo1Nm1j7rQ34M8b4Qk3fahLDYV0snqv+Za+e4QqsXzP7eiWL315pUVXqwgXcL
-Wo3wypgXrUi8MJ0N8OQ+tlPr+wwqJYgqTXq8rGxI47RAZuSUdLYKQ7yyz9Loqh8o
-nvfT3+cVNdT5T/PDNTJEQeDXHOen48Y+9F0r81J5fpHFsyILwj+NQMXS8wKgz/tQ
-Z6265Men6XcHe+f8fjd/LJddFRWw8vyOgqHTwG7/hhI7Zp9a9DCO1g9xKhPvkBWd
-sfbp9g6AbvBV2euUIhkMXpE4tYt3udmPORbMiRBA2GB+St25/RkRdN1ikqdyHgLu
-dNI/haI88ATmkHJDnbVmsEOHkvKIouzy6v1Oqq3NdTnO9/XIjrBJEkNE2YmhmCGT
-qGMZ2oUJOLHfIOmmcJblVz+KArxzQO9WmK9CpLuVFDAbICqkCficJNpMbPWpeYS7
-0SPXgBBGA86TapVBbdiUHUxwKOaAfdduBa9rThR4JPXpih24J21dpLU9WHmugnZn
-Jor4L5NMoRHHBnM9YaOqr7AYFdzf+S6pty+cd3IwqqTxlg0x9eGD3uCxjKK5/r7L
-jmguT+eFV3miPNf67LYi
-=Ju+r
+iQIcBAEBCAAGBQJVsK7uAAoJELp701BxlEWfaRUQAIzfB3BzaQRxCRmdeMla7U22
+YvcOj5+LNvfEXw6Wr7A2UL8kfPIxJhgTgYiPwpdg1mL79SvxdE5d0b+KCNfMw0ZD
+wo0yBx+UoJXebIuhmXaUzWr6cymZF1AIX7ofgmL4wDCYhhA/Axd8n/ZP80E15pOY
+Zglwqjpe+PujoZH5cED26JXL7R9oQSsORAZQGXaYvy0nhAxnTgiBtfDWk9cNCxaa
+5TObvGmK1ALHlCct6diBIzBXiHIYxVOPYodDi4S9lykrdw64zrOrN643PuhgbWNh
+X1FkYQYYww7uq/XLhHP/FOwO12bfKlAuErbywOma+KWBADDrJU8cWiiswkRPcVru
+9NO5SjET+4NQfNBNhycmqHNjb5L6Hs2cVaXCkl8yb1BZ1NFDfkFKTTDXR8gBLb+9
+dfqLdEKuwLsCNMxmCgvefpDs3ggSbz8LBDn4DWnkj5ObV3fpqpGORzaZOkuljBvh
+s6QspDDkW/wNHSpL7NeAfW3LkZRF3wewfZonwbmtAMhMi+p7+y5HrdDooPD0To2G
+ogq0nQ3F1gAx5jHTHOurBpJHbWD6107uyg5nqCeLdYB7QNWMODsddxImSCXrIBoY
+kZTJH1dRFD+7Idbi+/12VuLABbItNPP6wI/lU6xDcV9GmNO/DLVVIdc3dXX5es+A
+wqfBRXtnNm5h5gdSgjLu
+=BCL4
 -----END PGP SIGNATURE-----
diff --git a/www-servers/tomcat/tomcat-6.0.44-r0.ebuild b/www-servers/tomcat/tomcat-6.0.44-r0.ebuild
index b9f5178b16e3..fd4a4576b257 100644
--- a/www-servers/tomcat/tomcat-6.0.44-r0.ebuild
+++ b/www-servers/tomcat/tomcat-6.0.44-r0.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-r0.ebuild,v 1.3 2015/07/23 09:07:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.44-r0.ebuild,v 1.4 2015/07/23 09:07:57 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-r2.ebuild b/www-servers/tomcat/tomcat-7.0.59-r2.ebuild
index 5c9693629f17..b0d73931b687 100644
--- a/www-servers/tomcat/tomcat-7.0.59-r2.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.59-r2.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-r2.ebuild,v 1.4 2015/07/23 09:07:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.59-r2.ebuild,v 1.5 2015/07/23 09:07:57 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 ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="extra-webapps websockets"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-8.0.23-r2.ebuild b/www-servers/tomcat/tomcat-8.0.23-r2.ebuild
index c296ae1d7bdf..0ad51b1c613d 100644
--- a/www-servers/tomcat/tomcat-8.0.23-r2.ebuild
+++ b/www-servers/tomcat/tomcat-8.0.23-r2.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-8.0.23-r2.ebuild,v 1.3 2015/07/23 09:07:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-8.0.23-r2.ebuild,v 1.4 2015/07/23 09:07:57 ago Exp $
 
 EAPI="5"
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="8"
-KEYWORDS="amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?