Fix README installation for bug #258990.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28-gentoo-r1 i686

3 files changed, 21 insertions, 7 deletions

diff --git a/dev-java/tomcat-servlet-api/ChangeLog b/dev-java/tomcat-servlet-api/ChangeLog
index 9b44200690fb..e97da7295ea6 100644
--- a/dev-java/tomcat-servlet-api/ChangeLog
+++ b/dev-java/tomcat-servlet-api/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/tomcat-servlet-api
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.57 2008/12/08 02:34:28 jmbsvicetto Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.58 2009/02/14 19:28:26 betelgeuse Exp $
+
+  14 Feb 2009; Petteri Räty <betelgeuse@gentoo.org>
+  tomcat-servlet-api-3.ebuild:
+  Fix README installation for bug #258990.
 
   08 Dec 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   metadata.xml:
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 3791c8e006cf..f5b8ead90ef1 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 2.5-build.xml 2864 RMD160 d69af37473e7526f17ce99d7e5e624d2edac630b SHA1 f3da528002c5463406141bf63b5301d5518577f5 SHA256 b2cbb540ab2bfacc8044e0c6d67afbbd8c1e2e04a12a9c0f565902e1ef3c687a
 AUX jsp-api-2.0-manifest 474 RMD160 a443fc3b2085d4eb9bb494202025e03e8123f9e9 SHA1 b2886991939e7270a006bc91e17524c3a75fc68d SHA256 62c4ac2cef5685a2a631270034a945b1eaf774e89362486e27fd357dd928cfd0
 AUX servlet-api-2.4-manifest 310 RMD160 7ac278202ae5e30561cea42d602504bbdbb84dae SHA1 4faf5f3e370e8b2741b7eeae9a5181853b496eda SHA256 134371e8d3d0b137096e268df05751c4bcb29911d62746c70510253d6b334fd5
@@ -7,11 +10,18 @@ DIST apache-tomcat-5.5.27-src.tar.gz 7382057 RMD160 8114fa3be19fd28a5d2d0d7e7087
 DIST apache-tomcat-6.0.16-src.tar.gz 3527896 RMD160 8e6c0900889439f4cb89db35afb0c27e77103c00 SHA1 74127ba3da450a97869f2a2a2f0e134d23474018 SHA256 9e0a776f9d9c5fe935a39b066f74c07e7d26b4f30b66b22622a20dec235b0a7f
 DIST apache-tomcat-6.0.18-src.tar.gz 3484249 RMD160 ef85db0d65a4f3bdd3ca821420d06535050b6a93 SHA1 9182b0d6b2d0cb2d60f04be6211f3b3516bc518e SHA256 f5ad5dd12e221d75e25234ca734fb434cf45f3fcea93623232a73dc9bfd03dc4
 DIST jakarta-servletapi-src.tar.gz 65342 RMD160 9fc0def14700c4850455da1312e50135fd56eea9 SHA1 ffa93e8b69e0aa4384b7ce4cbb7f4552b6dd467a SHA256 404e2c55423c609122921a91e03f2b67d371fedc0af8996e005862d83d626697
-EBUILD tomcat-servlet-api-3.ebuild 928 RMD160 cd6a3c5b2ad5a88b308d80329a0ba0a065c6a0d1 SHA1 f3511ee1f4104f6209f27939231bc6917052a9e5 SHA256 7fd7df38cd26899ca305e3be34980b85596cfc80653cde937514172e3e08923f
+EBUILD tomcat-servlet-api-3.ebuild 925 RMD160 6d8d80e218e190a67a8641cbc4c79501a8e7fbed SHA1 c7dcdf87de3b01bc01cdbfc0d8eccb5aa33903b1 SHA256 9df50057ea6521bccbccb00f6db79fc479d1198fdf8e88ccd66a17ce05b50268
 EBUILD tomcat-servlet-api-4.1.36.ebuild 1044 RMD160 5f5dc80493e82c01705225f3f77e7d48f716030d SHA1 c82d406993ff1f1ab59c612649064d129f4db570 SHA256 bd903f29c3102ee50aeac49e3b6f20d4035d54e313096308c968b850573ebb75
 EBUILD tomcat-servlet-api-5.5.26.ebuild 1580 RMD160 cb2e756d2b499af0a84c0d1e1c644eb96236bb7d SHA1 b26f142ba4d256d5325cb05d795091caf3b6d899 SHA256 1f02a66e0483c48714a6d2147d961e301490ee3ebd5b6f16f159fcf44031af99
 EBUILD tomcat-servlet-api-5.5.27.ebuild 1581 RMD160 86a6b91794ec79d3d481413c2ebe25721fcc03b0 SHA1 9c2ed160be634c01a3d7d4cbd3e5430fc863e5f2 SHA256 b0ce99e4512b8a8bb48bd98d154e3461c9d04586cb81bc9e0e1cc2cf59a2042d
 EBUILD tomcat-servlet-api-6.0.16.ebuild 946 RMD160 35a6a20d81008810ccd71bfddc6ee03656b6be9a SHA1 330764d34f15d1f6c93ec0af7b2a29326db6e13f SHA256 0ff193f6a1b887e4c6dcf7e50c7b03e6297a763cdf7a9da8fe7cd575e5442e44
 EBUILD tomcat-servlet-api-6.0.18.ebuild 947 RMD160 0b169de5ba5fe6e2f80aac83a56478ce943235ee SHA1 69a081efc87f16ed6d2449d89d4d32ca39604a00 SHA256 81b6a3cbe96d60aa9f11cfad00fc90b167e4e11614c9f8f51def93ec8cb18ee6
-MISC ChangeLog 9937 RMD160 31c8616dfe13d1f7904bd41f6dbdce9a0d079fdd SHA1 1b90b286ef8f9409352cafe0d5036cf0237bdda1 SHA256 ab7613420c5d04d740c899f13f40b1b13e6d0dfd4eff00b28c90f8a67c04a8f6
+MISC ChangeLog 10064 RMD160 ca426ed1f439fa55faefd2fc48a595f0dd57163b SHA1 be6bf3d1ecc69a5d31f2f9a10e0ab41314576597 SHA256 45e982652b088cf361cf8bb6c6a761951cdecb0938b466dfd014b61b9f3eb0da
 MISC metadata.xml 265 RMD160 a2216ab83ce6380767c2b520d7db29fbac39758c SHA1 33a911d99c033f3cab73367890ae18925c3b2ce7 SHA256 6b387cd849d192d7139aa572a2638fd4d44d99d7ea78e30f26b0f3f4baeab84b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkmXG/8ACgkQcxLzpIGCsLSBaACdFwV+PO3uHoLtuFeXWDu+pAPU
+8UQAoJ23ZOY2MGNEovsHPXsTQvfU7Szf
+=2C/+
+-----END PGP SIGNATURE-----
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-3.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-3.ebuild
index da151ead0138..c5eb9121624e 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-3.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-3.ebuild,v 1.3 2008/05/30 17:18:39 ken69267 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-3.ebuild,v 1.4 2009/02/14 19:28:26 betelgeuse Exp $
 
 JAVA_PKG_IUSE="doc source"
 
@@ -26,5 +26,5 @@ src_install() {
 
 	use doc && java-pkg_dohtml -r ../dist/servletapi/docs/*
 	use source && java-pkg_dosrc src/share/javax
-	dodoc ../dist/README.txt
+	dodoc README || die
 }