amd64 stable, bug #303719

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index e79ada4bbcffba6477302be882f7974c302be304..738ae33109ed25e436afe5537fba8c8196d874eb 100644 (file)
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.227 2010/03/29 13:58:42 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.228 2010/03/29 21:40:34 maekke Exp $
+
+  29 Mar 2010; Markus Meier <maekke@gentoo.org> tomcat-6.0.26.ebuild:
+  amd64 stable, bug #303719
 
   29 Mar 2010; Christian Faulhammer <fauli@gentoo.org> tomcat-6.0.26.ebuild:
   stable x86, security bug 303719

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index c41609876f115bd3e496ebd6dc66c989988ccb00..abe04a9aad51bfff046fde7f77e4ad2df696945a 100644 (file)
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -19,13 +19,13 @@ DIST apache-tomcat-6.0.26-src.tar.gz 3472211 RMD160 84f8ad4d894204a8930fa57633c3
 EBUILD tomcat-5.5.27-r4.ebuild 10058 RMD160 a235794b1e53760c35289566dcaff2446437f53d SHA1 a49fb2db00fbcab78ab8672cdb11a8b0404df671 SHA256 18b69fb66c088a621db636243823701504af0a1dcc16df378e018f1958ecfa01
 EBUILD tomcat-6.0.20-r1.ebuild 6899 RMD160 14a5a13cdb09935cc9ba353f5cf7eb761f655a1f SHA1 5fd5dbc255a61b5f19a0c4eae71e719a478010da SHA256 33046ec344113795237a5bdccf233e6cf4f8af0c887ff516ec74a58e5fb5d113
 EBUILD tomcat-6.0.20.ebuild 6790 RMD160 19b0a9b7ce9b0764ccf2e3f0355a11744bb6434b SHA1 8a2b1bd20a099b97bfb50d7658ed5db99a0482b8 SHA256 b8868770240026c71773b8e3d63469ee6a71fe621e1d0751e867f5c513d4b5f2
-EBUILD tomcat-6.0.26.ebuild 6890 RMD160 e73aa0f77debd3e387b712a6ae9d4b68b8d63c41 SHA1 54be27704b7c0bcb8e3a2eab99cd005e0118d877 SHA256 8a982afde60e558b15b686951dde359db5d86f45e1ea03d81d2212fea8ef2dbb
-MISC ChangeLog 58767 RMD160 a7a237c01ba09901ce304f2c78b6bd49c7a86317 SHA1 351c2964841ce2f44bea5d8a0b10d4226a7b0d82 SHA256 7ea34d4312eaf4cc88ef7b0a8523d273525341f5debc87c82c5150e178129e47
+EBUILD tomcat-6.0.26.ebuild 6890 RMD160 42e54c5c082c7b59b60c7c596c78ea28ac22b3e6 SHA1 59341406ce62e4b3e6cf800ace50a1d7ff73a730 SHA256 62903145fb0b452d85abf0a82ece53cd33131c6a5c9cdc2ad66a005e97059ab3
+MISC ChangeLog 58867 RMD160 cbd42b442c0ca7e8bc0c98cadc6ea9161789900c SHA1 15e8304f7f9bd10876d76b29910d3a247ac8352f SHA256 4311b12968a448e591be1a4b1c36136d964e502d8ec0a04c93dd0e21c284d413
 MISC metadata.xml 658 RMD160 db94c7bc6ba622acfe88f970aa7d2e6fa1718a2a SHA1 aa25178fefb68df9dee7d8fc0d925a2fbbb655dd SHA256 5ddc2743ca9e3ec0bef7983248a9c8eda9238425288efb3acdecc8a828714bd8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuwshgACgkQNQqtfCuFneNuFwCdHKSjd/kLcnCRlr7mi95q7p6k
-/ygAn2BiNhR43cal9ZBwwi8+w69mFjMj
-=a9lw
+iEYEARECAAYFAkuxHhEACgkQkKaRLQcq0GJ3UACgqNXIYCtuoS2ap3bOsvKtCClh
+OMQAn19UatKZigbnTchv/nByWIwRgkmg
+=Fjfr
 -----END PGP SIGNATURE-----

diff --git a/www-servers/tomcat/tomcat-6.0.26.ebuild b/www-servers/tomcat/tomcat-6.0.26.ebuild
index 887891a1539c6f5698f2fbf9f84d33dbdbd40cbb..89996d2524937d6fb94cb8015f08bc332a3b77d5 100644 (file)
--- a/www-servers/tomcat/tomcat-6.0.26.ebuild
+++ b/www-servers/tomcat/tomcat-6.0.26.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.26.ebuild,v 1.4 2010/03/29 13:58:42 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.26.ebuild,v 1.5 2010/03/29 21:40:34 maekke 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=""