Stable for amd64, wrt bug #469434

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

4 files changed, 26 insertions, 12 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index cd76817ee07d..4c18e2f9ebf5 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.319 2013/07/08 16:57:56 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.320 2013/10/05 10:38:08 ago Exp $
+
+  05 Oct 2013; Agostino Sarubbo <ago@gentoo.org> tomcat-6.0.37.ebuild,
+  tomcat-7.0.42.ebuild:
+  Stable for amd64, wrt bug #469434
 
 *tomcat-7.0.42 (08 Jul 2013)
 
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 693dc7bf9523..6553c15cb260 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX tomcat-6.0.36-build.xml.patch 950 SHA256 33af0fd388c439e3ee74fd2271d94066169b530b61dab3f1f01a094ec22e3f9f SHA512 69775288f3ba31bc5b3f1f6125c1ca6f27c64647eeeb40928227fcbeb3a33f832ccc24be051efec9f8ca575475549c6493b12495d4a98e9e4fd1c27b9af68f8c WHIRLPOOL e31b35c1395c152c65863cddd79617ec92b21269567fc1458914e6f9b10e3a70698987d05724e52b706e6e0cfeab56e818feca5d04d80ee08f24bfefe89ea63f
 AUX tomcat-6.0.37-build.xml.patch 950 SHA256 33af0fd388c439e3ee74fd2271d94066169b530b61dab3f1f01a094ec22e3f9f SHA512 69775288f3ba31bc5b3f1f6125c1ca6f27c64647eeeb40928227fcbeb3a33f832ccc24be051efec9f8ca575475549c6493b12495d4a98e9e4fd1c27b9af68f8c WHIRLPOOL e31b35c1395c152c65863cddd79617ec92b21269567fc1458914e6f9b10e3a70698987d05724e52b706e6e0cfeab56e818feca5d04d80ee08f24bfefe89ea63f
@@ -17,17 +17,27 @@ DIST apache-tomcat-7.0.39-src.tar.gz 4295207 SHA256 d9b4daceb2040bff84dbc37ea07d
 DIST apache-tomcat-7.0.41-src.tar.gz 4407748 SHA256 283a80c5be1a1eda9fc8864b11dcd026ba3bf2433b0d8377a4da4c2536a07ea6 SHA512 dadff0f20e5e7b5c4b46ee7ba4c3bc8776568b6fff182cfd3764abd5eba6e7bb4239a3700969c6065b8991ba8a04061042a917e7bfe29de2afbcce788554fd9e WHIRLPOOL 2bd6dc37704709f0ce1096df1bd96faaf63aa1796d664777ad4f4280e22bbcd0acc06cc48eae852481ef60a16efdf8ae6a1ca2dd4c5dc06ea6ed684103dbfa65
 DIST apache-tomcat-7.0.42-src.tar.gz 4422120 SHA256 5dbc2194b894de0b620752f18f5dc69901627f49b87d9dfb5951750bb9c20c72 SHA512 02703483ceeb218fdbb9c57cd45af3572d0c482ff0914e29862646bf395d03f81efd94271ffa6a59412df1b6cbecc7380e7bfb9e83da8db6a8f63355b722bcd0 WHIRLPOOL 21ba3934169ef9672f0f160e45dad4cdf04827e64bb3fcce1eac6fa7a9d4cf5b699bb96dd07a900bbea1099d35a91fe0df3dbcbdeeef44ef3e969af78aaafcd2
 EBUILD tomcat-6.0.36.ebuild 3960 SHA256 03400e345a2e33c6f32f0d24f7ef2e946cf0432189ad4498c0929a3226c69ce4 SHA512 a666209dfb901795c9c1bfbdab04934bca2c0496d94c017033e3d1d96aac9b12187669459023836d87719f279c245f64701c226d0a5fb39f9e656c2ba726af08 WHIRLPOOL 486de361f58a411d40c4406f395ef6f6ebedfa4a10650065dfa97bafed1ffd325078e8bd95f3ee58b87bc0341bd504210680a512c646901befebd46fa750452b
-EBUILD tomcat-6.0.37.ebuild 3964 SHA256 d5582363cbf7fd8be2a1072224618c36e4a1f37bba6c312a0f68a0971bcef6d0 SHA512 ed1043b0e37f13c961a964836da811207d3a86949164319aa2a4bd3811b86fd26e23f139755321a17bc2060275ff5542950f58f4c90adaaccef7ec3532035b31 WHIRLPOOL fbbddf6ed12b8ef0ffcbafbd4ba7a0971ed26992ffc70b18efa1dc46e18839557ffdbbd72f8c2f081724251e3b0f7e6c60f54b644b114a74cf3b188adf33d227
+EBUILD tomcat-6.0.37.ebuild 3958 SHA256 9b5abfd9b85ef482e435429af97a72bc44ad84406056239988ecd8c8eb88c46d SHA512 484c8fa96d766fd9e9540912446934f9a8b43a2abfab26d11bdc07f917e13ee759e8da4d0cbe3510949a768aa102e9d4d3f9755e0a26102b03cc617c4d16e78b WHIRLPOOL 70eeed811a3df6a608ae228e416e53dd4db7b0ca994aa6ea73bdd7348b4b196743f9ada108bb4b259de3cf0645883b04ad3b49d5b4f35d922e8538297f24b5de
 EBUILD tomcat-7.0.32.ebuild 4041 SHA256 cfc34ea3aab98e6da8fdbb82fe314a3d14dddd99d551609a347a64ea4f8a7a2d SHA512 1abcee9506d04cae7c1936fa8a3f036d77e2519cf05b7f8d99602b35af339ecf279895cb38129920bbe1832a7db0cae2ac8a807fbb927ee01d6c0ba2f6748b8c WHIRLPOOL 9cf2d47341b35adeda484386ae1018e887d1be61edb0ed944dbd31e1fae3d4fdf98683b24d5d4cf21851381080dac1f04f20579893abba1672b8f2a5b6dc3949
 EBUILD tomcat-7.0.39.ebuild 4045 SHA256 acc4219d51960e1ea990753a4304f7f36834ef106ea1572fd2c3629098dd1f9c SHA512 10fb49cedfcb04b2c9c632f6731f9028d3673219a8ca011fb4cb493d1bacaf96eacab9a299b547154bb1420fc28495321cacb0f9b37a71236fdc33f9accdd507 WHIRLPOOL 6a5faa7a56143f6e8e0812c4ad24e9a0ce169d6de5e58d214dccf75e1046c71aa0c778c3970aa1927cd0e8a957a3349b04d4e6675260df705b6c4940e9ebc463
 EBUILD tomcat-7.0.41.ebuild 4045 SHA256 a24b93f899e8eb2d0f4f052d476f3cad5421393024fb24fedd1a4029a9e56da8 SHA512 46d7852fc69ef82f639abb3cb14cadfa77bdebb4ef6a03525c8823dfb4527651975c39232f9e6765afa574ca5ebe0c7701c2a52002e980d264bd2d435c750e2e WHIRLPOOL 0c01789959c1825dca29163eed6396fd8b4535b2c6385053c3b380254af863e0cacc4a7d68b4a51934ee14a6f4813a6419139b57742fe4dde1809f52d0a1b6d3
-EBUILD tomcat-7.0.42.ebuild 4045 SHA256 0ae565ace8d7be28a29c415389ce15d8216ba48ec69577cd04c2fb9670bf9db4 SHA512 b99ddcdd204464e987c1128510cf0b45efb61e925b9933ba64986c9d9f12b42510d83287422ef7f9d31d04a066baaa7b8c33d0c8d00fcc6c57341d381442fb5c WHIRLPOOL c40237233c6ac0527f88115655e20e6bb544cc3425404d3130cde3a9c4d079f59e2aa42a928cfc0c6cf0d95761fc2a7d1235bd24f30ae60b710098c6756a4b69
-MISC ChangeLog 77014 SHA256 0cd00d6eb85a654844172262b5a97856da4693955e3832ad2c70ce0a1efc1472 SHA512 44ac0d3dee748a214fa6d2b65e7e8099a2e1b255b64ee2711a549f1b8a4a09669fb5d2f29a8ae9eefdbcf011cf5f07b49a1fb909ea057e3591ef22a0f30ed0e9 WHIRLPOOL 615f5a75867278f926585bf49247ccf78034443069d83efcef17864c877f2c2c3e668c5ffc22cba6c793d9f9957cc4438c09578d5b1f7a1e8df89d3fd74410f8
+EBUILD tomcat-7.0.42.ebuild 4039 SHA256 e91ea38957077fe0fe63af478894bdb3befef923dace0036a952d30504a4787d SHA512 5bd0c477641e78d7ce50d502f1b40a0dad0c3965cb134478a4ab885a3e8a5f4115049ae4e18ed335a20546685c5a58e4227d45ce77be2abf9ab0d8cb7aacbf18 WHIRLPOOL e0d1cbd0481c202580ffb859666291f077596a3ecdc097dc0167d50be954dad45ba722d351a90e80923d15b646f3f972f3638737a2384b5ccbde5c225bce7adc
+MISC ChangeLog 77141 SHA256 139938b9a66b2096660255972c130438ac80a5f1e8d2652741a8d78b4bb7a148 SHA512 b4f9cfee05620aef7c1f2d0a9574aaeda30f3fc331119a57c2078e68039ccc5257c63990f452cdc59686112207630d9f8039bcb9741e5233c540a4a5db476d72 WHIRLPOOL 5f0ea3f4752b36189bfadaf612f4094bb83856aff24597a130ee6489fbf9d37a30a0819809b86e1f09a452f39005845737e48bc4627ebc87a8a2d883c5e78663
 MISC metadata.xml 561 SHA256 a53b91aa1c4371952ed465d0b570fde6eebd1a621804990aa3d2c31f3a8cecab SHA512 354849871d8ff7e9d3bba1bd412f78789693518f1f9804aac412b64e9e86622fb86080b8290bbe16424c760b3601e96824cb3f0b956edbc2245dfa5be299c8c5 WHIRLPOOL f740fcc281807c913934662fcff48a023d42065ec0b50564d4a12ff970ce09447cac0a71016a33ff4896a596dcd86cd9372b4a12286fb0bf46bb01bb6bd2c7e1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlHa75UACgkQ5LnnVc/kfi9CcgD7BGN09i7YoCNH4astJfakMWVR
-Aqo7phF/4QARbxiKthEA/RS/Lm7ooMwyyCWcM2/THsz5jPK+6HpLoPtMQ9BE5Ad1
-=Ppaw
+iQIcBAEBCgAGBQJST+vwAAoJELp701BxlEWfbPMP/Rqel2d2tCylVH2QRlfyqpYk
+DJOYVI03M7Js7W2TXaiR8wCViwhOGgy+fev1vQehqrxnzKxyuwBUjcD8UmAkRV4s
+VPK6huyi8hiNHI31DD5Tlh0eblsnrahQCnWK7Q1nZzXypTapFeL25WyutfHcllXL
+wNgPtSIy1Mb5+L/3BVHa0vAmrsee9XaoBOw8s3+SKoh/fa1LAgyspMSxpXDXWCMc
+PgIJAmstzUSdsLzKlPwEsTqNoPQlv7PhaJOzG+0faOGFrqTfmPSS4zmu46hDS1jp
+M/rkawQ8nsRminetUK/3H6LrwxI6ukDeYmrfA2JGM2dbdEm7TfYofMP3bGEFQdWK
+k9NU3AyF6FDntaPv8Ruq+Q/fmYu1/6HKB3epafzzkFTYaVaXIIyQ6hHztCYTRoIu
+b+v+ahCS1kjcBGa7kxM6P3cZK3ZL+9Sv+MlLSoTVedi2cVp6dyMOJtR7rqDJ+R7P
+HYJlCAs7cTeVLBabWi5ST+96S6OwGYvuDU3z3wqhwmyoTDJGVF340v9UK/Rb56ei
+AgHBM9L5U/k2UL+/Gl2o6zKNYbVcCqiszjJmFhuHUb1QoAwNUChyTdAmM9oygdMg
+JY7R+wbXQmPgoCYEqsbRczkBi/8xBSfQ9GFxcOYdTaf3OSA5Vf+a2R0ARA7pMQMD
+a8AUouiBstJbrPnQ1lDj
+=thMg
 -----END PGP SIGNATURE-----
diff --git a/www-servers/tomcat/tomcat-6.0.37.ebuild b/www-servers/tomcat/tomcat-6.0.37.ebuild
index 662a51446324..a55cb215ad9c 100644
--- a/www-servers/tomcat/tomcat-6.0.37.ebuild
+++ b/www-servers/tomcat/tomcat-6.0.37.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.37.ebuild,v 1.1 2013/06/11 11:35:01 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.37.ebuild,v 1.2 2013/10/05 10:38:08 ago Exp $
 
 EAPI=4
 
@@ -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.42.ebuild b/www-servers/tomcat/tomcat-7.0.42.ebuild
index f25e365ccf50..94d0eb0363e9 100644
--- a/www-servers/tomcat/tomcat-7.0.42.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.42.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.42.ebuild,v 1.1 2013/07/08 16:57:56 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.42.ebuild,v 1.2 2013/10/05 10:38:08 ago Exp $
 
 EAPI=4
 
@@ -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-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?