Switched to java-virtual/servlet-api, added ~amd64 keyword

Package-Manager: portage-2.1.4_rc14

4 files changed, 22 insertions, 16 deletions

diff --git a/dev-java/commons-jelly/ChangeLog b/dev-java/commons-jelly/ChangeLog
index c32c91d223eb..8d247fc394d5 100644
--- a/dev-java/commons-jelly/ChangeLog
+++ b/dev-java/commons-jelly/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/commons-jelly
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jelly/ChangeLog,v 1.8 2008/01/10 22:19:50 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jelly/ChangeLog,v 1.9 2008/01/11 07:06:21 wltjr Exp $
+
+*commons-jelly-1.0-r3 (11 Jan 2008)
+
+  11 Jan 2008; William L. Thomson Jr. <wltjr@gentoo.org>
+  -commons-jelly-1.0-r2.ebuild, +commons-jelly-1.0-r3.ebuild:
+  Switched to java-virtual/servlet-api, added ~amd64 keyword
 
   10 Jan 2008; Vlastimil Babka <caster@gentoo.org>
   commons-jelly-1.0-r2.ebuild:
diff --git a/dev-java/commons-jelly/Manifest b/dev-java/commons-jelly/Manifest
index e777a8fa3347..daf7a45567de 100644
--- a/dev-java/commons-jelly/Manifest
+++ b/dev-java/commons-jelly/Manifest
@@ -3,18 +3,18 @@ MD5 54a1c7c1840da66a583e5ec54ddb94c1 files/commons-jelly-1.0-gentoo.patch 2224
 RMD160 ab9179ac39196b1dbe6fc8f9bffdc498ad363697 files/commons-jelly-1.0-gentoo.patch 2224
 SHA256 0e064c87ae4a2a91f7c98c546e0f3bf9f9ff4caf877e0c2f28a6b3443e6f3533 files/commons-jelly-1.0-gentoo.patch 2224
 DIST commons-jelly-1.0-src.tar.gz 174769 RMD160 c273e80fb10327a833d192e89500a08302d68c58 SHA1 a0aedfa7ce69288277cc3c06b1d832a7a97affe5 SHA256 113d606361845d08dab69f187690bf5dcfb5e9ca8fab780135898eb6d0a8d7d1
-EBUILD commons-jelly-1.0-r2.ebuild 1827 RMD160 dbb7ca40bd76d51422593e8107a093d459f4fbbb SHA1 4029dba2554280240a497644c499656f3876858a SHA256 5e6ca2de11ea7c0166fd0d553659f995a558de19e54c0c30b085f9eab58a46fe
-MD5 b905d7307fc23e21c7b33cfc69039c3a commons-jelly-1.0-r2.ebuild 1827
-RMD160 dbb7ca40bd76d51422593e8107a093d459f4fbbb commons-jelly-1.0-r2.ebuild 1827
-SHA256 5e6ca2de11ea7c0166fd0d553659f995a558de19e54c0c30b085f9eab58a46fe commons-jelly-1.0-r2.ebuild 1827
-MISC ChangeLog 1562 RMD160 232ad5fb7cc8515467c4f6c18d8073f39b0d44b9 SHA1 00622289d321095fbf4cf109bf7938e978050b02 SHA256 ce305a0e4f9b835b3c6227acd396c6c417da1ba924204361388362c12b4e1fb2
-MD5 02f7fc79451222c435b0efab64e6cf8a ChangeLog 1562
-RMD160 232ad5fb7cc8515467c4f6c18d8073f39b0d44b9 ChangeLog 1562
-SHA256 ce305a0e4f9b835b3c6227acd396c6c417da1ba924204361388362c12b4e1fb2 ChangeLog 1562
+EBUILD commons-jelly-1.0-r3.ebuild 1840 RMD160 280382b92fee89b6cf2d6e4702d697a44da70559 SHA1 dc24df7e5ed9c287be3c43fbcb03896117e7ac33 SHA256 2e3868a3ea7a46f4709e4136e937ab74c2015064db2c4b8cd8bc9a8f82027ee2
+MD5 9c6f5311704272f65e2f083cc33f4c2e commons-jelly-1.0-r3.ebuild 1840
+RMD160 280382b92fee89b6cf2d6e4702d697a44da70559 commons-jelly-1.0-r3.ebuild 1840
+SHA256 2e3868a3ea7a46f4709e4136e937ab74c2015064db2c4b8cd8bc9a8f82027ee2 commons-jelly-1.0-r3.ebuild 1840
+MISC ChangeLog 1779 RMD160 2ec6c8babb3b43a7e159a9fbdd79e8503f065c6a SHA1 c1fcbaf028475de5291487bdc1bac6d195c3501e SHA256 3971e5c9bb9dbda8b5c7aba272f236b054d45bee3c525b99a58df0911ae62cdf
+MD5 14b40b89edfb3a3e59eee029b1910c31 ChangeLog 1779
+RMD160 2ec6c8babb3b43a7e159a9fbdd79e8503f065c6a ChangeLog 1779
+SHA256 3971e5c9bb9dbda8b5c7aba272f236b054d45bee3c525b99a58df0911ae62cdf ChangeLog 1779
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata.xml 157
-MD5 3744be2052ab79799a9e41563ba89d34 files/digest-commons-jelly-1.0-r2 265
-RMD160 038eb778e7c03b78590531801634d23690eaa86d files/digest-commons-jelly-1.0-r2 265
-SHA256 f60bf1dba04b835d8f1c15d2a3ca7034489e1364e604ee8f0df384485808529c files/digest-commons-jelly-1.0-r2 265
+MD5 3744be2052ab79799a9e41563ba89d34 files/digest-commons-jelly-1.0-r3 265
+RMD160 038eb778e7c03b78590531801634d23690eaa86d files/digest-commons-jelly-1.0-r3 265
+SHA256 f60bf1dba04b835d8f1c15d2a3ca7034489e1364e604ee8f0df384485808529c files/digest-commons-jelly-1.0-r3 265
diff --git a/dev-java/commons-jelly/commons-jelly-1.0-r2.ebuild b/dev-java/commons-jelly/commons-jelly-1.0-r3.ebuild
index 512c7c322bf2..0b869e73fc71 100644
--- a/dev-java/commons-jelly/commons-jelly-1.0-r2.ebuild
+++ b/dev-java/commons-jelly/commons-jelly-1.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jelly/commons-jelly-1.0-r2.ebuild,v 1.2 2008/01/10 22:19:50 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jelly/commons-jelly-1.0-r3.ebuild,v 1.1 2008/01/11 07:06:21 wltjr Exp $
 
 inherit java-pkg-2 java-ant-2 eutils
 
@@ -11,11 +11,11 @@ SRC_URI="mirror://apache/jakarta/commons/jelly/source/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc test source"
 
 RDEPEND=">=virtual/jre-1.4
-	~dev-java/servletapi-2.3
+	~java-virtuals/servlet-api-2.3
 	=dev-java/commons-cli-1*
 	dev-java/commons-lang
 	dev-java/commons-discovery
@@ -45,7 +45,7 @@ src_unpack() {
 
 	mkdir -p "${S}/lib"
 	cd "${S}/lib"
-	java-pkg_jar-from servletapi-2.3,commons-cli-1,commons-lang
+	java-pkg_jar-from servlet-api-2.3,commons-cli-1,commons-lang
 	java-pkg_jar-from commons-discovery,forehead,jakarta-jstl,commons-jexl-1.0
 	java-pkg_jar-from commons-beanutils-1.6,commons-collections
 	java-pkg_jar-from dom4j-1,jaxen-1.1,xerces-2
diff --git a/dev-java/commons-jelly/files/digest-commons-jelly-1.0-r2 b/dev-java/commons-jelly/files/digest-commons-jelly-1.0-r3
index c5964f16afb6..c5964f16afb6 100644
--- a/dev-java/commons-jelly/files/digest-commons-jelly-1.0-r2
+++ b/dev-java/commons-jelly/files/digest-commons-jelly-1.0-r3