5 files changed, 38 insertions, 23 deletions
diff --git a/dev-java/servletapi/ChangeLog b/dev-java/servletapi/ChangeLog
index e8206b04c2ca..0514177468ca 100644
--- a/dev-java/servletapi/ChangeLog
+++ b/dev-java/servletapi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/servletapi
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/ChangeLog,v 1.47 2006/12/10 21:51:03 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/ChangeLog,v 1.48 2006/12/11 19:26:57 opfer Exp $
+
+  11 Dec 2006; Christian Faulhammer <opfer@gentoo.org>
+  servletapi-2.2-r3.ebuild, servletapi-2.3-r3.ebuild,
+  servletapi-2.4-r5.ebuild:
+  stable x86, bugs #157760, #157761, #157762
 
 *servletapi-2.4-r5 (10 Dec 2006)
 
diff --git a/dev-java/servletapi/Manifest b/dev-java/servletapi/Manifest
index 437eedd455b7..11b2bf309544 100644
--- a/dev-java/servletapi/Manifest
+++ b/dev-java/servletapi/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gentoo-servletapi-2.4-patch 4281 RMD160 68e22c84152500655640efb7559311d21533170c SHA1 e121290cbce775945dc8eaf4e57c4d8792c58237 SHA256 612b65746f3d68ac3b025a96352d2dffec53203c31446d5aaa17015d6db67676
 MD5 9a8f107226db82b54f939c300a6d68e5 files/gentoo-servletapi-2.4-patch 4281
 RMD160 68e22c84152500655640efb7559311d21533170c files/gentoo-servletapi-2.4-patch 4281
@@ -10,30 +13,30 @@ EBUILD servletapi-2.2-r2.ebuild 925 RMD160 c0af96d15a9161431ec3b294d1c510939de79
 MD5 fe25599e394932ed73d2c9091bda8382 servletapi-2.2-r2.ebuild 925
 RMD160 c0af96d15a9161431ec3b294d1c510939de799d3 servletapi-2.2-r2.ebuild 925
 SHA256 d7bd27b713c0bbb07f77f1ff14ca839cd9b0e17fcbc4a36808c01c398ffe6c90 servletapi-2.2-r2.ebuild 925
-EBUILD servletapi-2.2-r3.ebuild 803 RMD160 966f47fa1e333adadc65e7fd43a99d9011299c3f SHA1 9c01d3da61691fb7e1ceae0f5b77d67112d2463f SHA256 849fc90a30c3cf570446909fee3e53aca06911ec5be74e2d20cfcd2341dc6f3d
-MD5 5bb49a47736d9a34e930dee8faf3ccd2 servletapi-2.2-r3.ebuild 803
-RMD160 966f47fa1e333adadc65e7fd43a99d9011299c3f servletapi-2.2-r3.ebuild 803
-SHA256 849fc90a30c3cf570446909fee3e53aca06911ec5be74e2d20cfcd2341dc6f3d servletapi-2.2-r3.ebuild 803
+EBUILD servletapi-2.2-r3.ebuild 798 RMD160 d5e1bad060d0062532c1f6555cb81bd62872b7ca SHA1 ff732a071a457885779414a346c32ee13eb83da4 SHA256 099c8bac543e415f113b9065d8d9f95037a1a801ed1f41593abfb6d8e9a43cb8
+MD5 3d21d322632d220ad6f0593faad3595c servletapi-2.2-r3.ebuild 798
+RMD160 d5e1bad060d0062532c1f6555cb81bd62872b7ca servletapi-2.2-r3.ebuild 798
+SHA256 099c8bac543e415f113b9065d8d9f95037a1a801ed1f41593abfb6d8e9a43cb8 servletapi-2.2-r3.ebuild 798
 EBUILD servletapi-2.3-r2.ebuild 957 RMD160 b18b7086057afc6497eca43c92deed9312a6e284 SHA1 0c34a884c240cde327e8f6b4639c1cd609f179d2 SHA256 1a6c698938d79277c60174fa1e99f2e8afa110803baec7927b34d07f6719e977
 MD5 97998fad6e97a75a5cb0acd0663c6891 servletapi-2.3-r2.ebuild 957
 RMD160 b18b7086057afc6497eca43c92deed9312a6e284 servletapi-2.3-r2.ebuild 957
 SHA256 1a6c698938d79277c60174fa1e99f2e8afa110803baec7927b34d07f6719e977 servletapi-2.3-r2.ebuild 957
-EBUILD servletapi-2.3-r3.ebuild 842 RMD160 73e92f7098cdae6c9bc66170a0cf513d5f211237 SHA1 7ca2722f4b56acc1507b1bd4aea3676873a1a68f SHA256 4b7ad5dfcc837aefa2a93ef5ea2d45d6d5878836549184fb4ed870e76b08b330
-MD5 c15ca33439a0488ce9c010ffe7220d27 servletapi-2.3-r3.ebuild 842
-RMD160 73e92f7098cdae6c9bc66170a0cf513d5f211237 servletapi-2.3-r3.ebuild 842
-SHA256 4b7ad5dfcc837aefa2a93ef5ea2d45d6d5878836549184fb4ed870e76b08b330 servletapi-2.3-r3.ebuild 842
+EBUILD servletapi-2.3-r3.ebuild 838 RMD160 8ae6f358d266db310164b997a4e680887153f8d4 SHA1 914804f4d5b5a516f421933f2cfbc331db977a1a SHA256 37bbdb270466fb23e78f8d24c79f9c58da13867c287fc73460f1aa86ce7a6bdb
+MD5 d2c4a60f2424d88ce2e11df3241ac233 servletapi-2.3-r3.ebuild 838
+RMD160 8ae6f358d266db310164b997a4e680887153f8d4 servletapi-2.3-r3.ebuild 838
+SHA256 37bbdb270466fb23e78f8d24c79f9c58da13867c287fc73460f1aa86ce7a6bdb servletapi-2.3-r3.ebuild 838
 EBUILD servletapi-2.4-r2.ebuild 1479 RMD160 dfc60ee073d72d9e295b00c93ffada831cbd52e7 SHA1 31e8370a365e2e6c0abcb7dacff632b3a50004fe SHA256 86ff5a75f4319df9735b982ebe8013d2a80ad593599c06b3aa08ef801565715d
 MD5 f862a301aa3127e92e5f37c772bf2977 servletapi-2.4-r2.ebuild 1479
 RMD160 dfc60ee073d72d9e295b00c93ffada831cbd52e7 servletapi-2.4-r2.ebuild 1479
 SHA256 86ff5a75f4319df9735b982ebe8013d2a80ad593599c06b3aa08ef801565715d servletapi-2.4-r2.ebuild 1479
-EBUILD servletapi-2.4-r5.ebuild 1368 RMD160 455cd26b5ada7483cf41c6e12975e1ba01b5aa2c SHA1 cc34f8aa1475069cb380f0aff8fbe4af592843c5 SHA256 6ff077ba276d52a6644262cf4c395f585b23b81ee0d5ddb5badcbf3b3f4d9b4c
-MD5 acba94a29e5a221c40f89ac42145b280 servletapi-2.4-r5.ebuild 1368
-RMD160 455cd26b5ada7483cf41c6e12975e1ba01b5aa2c servletapi-2.4-r5.ebuild 1368
-SHA256 6ff077ba276d52a6644262cf4c395f585b23b81ee0d5ddb5badcbf3b3f4d9b4c servletapi-2.4-r5.ebuild 1368
-MISC ChangeLog 7101 RMD160 a5b4801d39e32772115416f040c6929f4cc3fa17 SHA1 0628f7e43c2119226480bf823cb278f545811b36 SHA256 0e08a59c81158e12faf40403bce24e4d240c48617d6f099ecc9df23468d6ed7d
-MD5 1b7b3fe3a71569033b815ffb5e9bb96e ChangeLog 7101
-RMD160 a5b4801d39e32772115416f040c6929f4cc3fa17 ChangeLog 7101
-SHA256 0e08a59c81158e12faf40403bce24e4d240c48617d6f099ecc9df23468d6ed7d ChangeLog 7101
+EBUILD servletapi-2.4-r5.ebuild 1367 RMD160 66fad6902797ac6bed543b9c0fec4aee7cf9200d SHA1 4245c6a20b3f410cc5dc4c450e668ae40ec2e180 SHA256 16a5eae3a0c5957c09908cc1b1704626e5e1054d8b09e9b006209d11952fd9c9
+MD5 9b70809e952ed46e3bf4ac7a8cc20a2b servletapi-2.4-r5.ebuild 1367
+RMD160 66fad6902797ac6bed543b9c0fec4aee7cf9200d servletapi-2.4-r5.ebuild 1367
+SHA256 16a5eae3a0c5957c09908cc1b1704626e5e1054d8b09e9b006209d11952fd9c9 servletapi-2.4-r5.ebuild 1367
+MISC ChangeLog 7284 RMD160 bca3669a588799e174bc83429cda60b325f09643 SHA1 7a758d19f118d25824b43e00175246e7200891d2 SHA256 699a500471e0dd9e9bda18ada321cd45d69fbbc0aeb96372ed73db58466758d1
+MD5 3dcbcada1dd395a514a322d5d6d7db66 ChangeLog 7284
+RMD160 bca3669a588799e174bc83429cda60b325f09643 ChangeLog 7284
+SHA256 699a500471e0dd9e9bda18ada321cd45d69fbbc0aeb96372ed73db58466758d1 ChangeLog 7284
 MISC metadata.xml 370 RMD160 80f77811a1330480797cff01b1e90e883ecb4d51 SHA1 0d60a8ede5babbd15577612fe7b9e504e5a73689 SHA256 d82a36005520445f65916bb8e8e5a4e41c3af6cc5be87cb2263337074e39b704
 MD5 eab22d527a1a92afde250a0ff957b829 metadata.xml 370
 RMD160 80f77811a1330480797cff01b1e90e883ecb4d51 metadata.xml 370
@@ -56,3 +59,10 @@ SHA256 4d402c7af5197bb866cf29d86cbc5cf9098765d6a74d875bdf587cc226eed112 files/di
 MD5 8adc14a8534e1c6f8d5f96b371e1895f files/digest-servletapi-2.4-r5 277
 RMD160 b9c5deac84bf5acd7a65ad80bdfaca9f7e343f3f files/digest-servletapi-2.4-r5 277
 SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/digest-servletapi-2.4-r5 277
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFFfbEYNQqtfCuFneMRAlDQAJ9Q6sZa97mdmTIMH+tejsBHtjkejQCfU0kC
+uBy2DTq1/Bo/fHFUES2xRrE=
+=g0Ow
+-----END PGP SIGNATURE-----
diff --git a/dev-java/servletapi/servletapi-2.2-r3.ebuild b/dev-java/servletapi/servletapi-2.2-r3.ebuild
index b5b2a293a87f..59af0b9d14f9 100644
--- a/dev-java/servletapi/servletapi-2.2-r3.ebuild
+++ b/dev-java/servletapi/servletapi-2.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/servletapi-2.2-r3.ebuild,v 1.4 2006/12/09 09:37:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/servletapi-2.2-r3.ebuild,v 1.5 2006/12/11 19:26:57 opfer Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -12,7 +12,7 @@ DEPEND=">=virtual/jdk-1.4
 RDEPEND=">=virtual/jre-1.3"
 LICENSE="Apache-1.1"
 SLOT="2.2"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc x86 ~x86-fbsd"
 IUSE="doc"
 S="${WORKDIR}/jakarta-servletapi-src"
 
diff --git a/dev-java/servletapi/servletapi-2.3-r3.ebuild b/dev-java/servletapi/servletapi-2.3-r3.ebuild
index 0dde92a24ddf..7fb908f1f4ee 100644
--- a/dev-java/servletapi/servletapi-2.3-r3.ebuild
+++ b/dev-java/servletapi/servletapi-2.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/servletapi-2.3-r3.ebuild,v 1.5 2006/10/05 17:14:27 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/servletapi-2.3-r3.ebuild,v 1.6 2006/12/11 19:26:57 opfer Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}-20021101.tar.gz"
 
 LICENSE="Apache-1.1"
 SLOT="2.3"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd"
 IUSE="doc source"
 
 DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/servletapi/servletapi-2.4-r5.ebuild b/dev-java/servletapi/servletapi-2.4-r5.ebuild
index b9aa373a4c30..480c13c0474e 100644
--- a/dev-java/servletapi/servletapi-2.4-r5.ebuild
+++ b/dev-java/servletapi/servletapi-2.4-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/servletapi-2.4-r5.ebuild,v 1.1 2006/12/10 21:51:03 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/servletapi-2.4-r5.ebuild,v 1.2 2006/12/11 19:26:57 opfer Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/jakarta/tomcat-5/v${TC_VERSION}/src/apache-tomcat-${TC_
 
 LICENSE="Apache-1.1"
 SLOT="2.4"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd"
 IUSE="doc source"
 
 DEPEND=">=virtual/jdk-1.4