Switched to EAPI=1 slot deps.

(Portage version: 2.1.4.1)

5 files changed, 32 insertions, 19 deletions

diff --git a/java-virtuals/servlet-api/ChangeLog b/java-virtuals/servlet-api/ChangeLog
index a78fd8a546ff..197bb0401a37 100644
--- a/java-virtuals/servlet-api/ChangeLog
+++ b/java-virtuals/servlet-api/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for java-virtuals/servlet-api
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/java-virtuals/servlet-api/ChangeLog,v 1.10 2008/03/22 19:33:13 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/java-virtuals/servlet-api/ChangeLog,v 1.11 2008/03/22 23:31:08 wltjr Exp $
+
+  22 Mar 2008; William L. Thomson Jr. <wltjr@gentoo.org>
+  servlet-api-2.2.ebuild, servlet-api-2.3.ebuild, servlet-api-2.4.ebuild,
+  servlet-api-2.5.ebuild:
+  Switched to EAPI=1 slot deps.
 
   22 Mar 2008; William L. Thomson Jr. <wltjr@gentoo.org>
   servlet-api-2.2.ebuild:
diff --git a/java-virtuals/servlet-api/servlet-api-2.2.ebuild b/java-virtuals/servlet-api/servlet-api-2.2.ebuild
index 696f404711b7..98db6a66cece 100644
--- a/java-virtuals/servlet-api/servlet-api-2.2.ebuild
+++ b/java-virtuals/servlet-api/servlet-api-2.2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/java-virtuals/servlet-api/servlet-api-2.2.ebuild,v 1.5 2008/03/22 19:33:13 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/java-virtuals/servlet-api/servlet-api-2.2.ebuild,v 1.6 2008/03/22 23:31:08 wltjr Exp $
+
+EAPI=1
 
 inherit java-virtuals-2
 
@@ -9,11 +11,11 @@ HOMEPAGE="http://java.sun.com/products/servlet/"
 SRC_URI=""
 
 LICENSE="as-is"
-SLOT="2.2"
+SLOT="${PV}"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND="=dev-java/tomcat-servlet-api-3"
+RDEPEND="dev-java/tomcat-servlet-api:${SLOT}"
 DEPEND=""
 
-JAVA_VIRTUAL_PROVIDES="tomcat-servlet-api-2.2"
+JAVA_VIRTUAL_PROVIDES="tomcat-servlet-api-${SLOT}"
diff --git a/java-virtuals/servlet-api/servlet-api-2.3.ebuild b/java-virtuals/servlet-api/servlet-api-2.3.ebuild
index b84382153075..c7dc30901153 100644
--- a/java-virtuals/servlet-api/servlet-api-2.3.ebuild
+++ b/java-virtuals/servlet-api/servlet-api-2.3.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/java-virtuals/servlet-api/servlet-api-2.3.ebuild,v 1.10 2008/03/16 17:43:08 ken69267 Exp $
+# $Header: /var/cvsroot/gentoo-x86/java-virtuals/servlet-api/servlet-api-2.3.ebuild,v 1.11 2008/03/22 23:31:08 wltjr Exp $
+
+EAPI=1
 
 inherit java-virtuals-2
 
@@ -9,11 +11,11 @@ HOMEPAGE="http://java.sun.com/products/servlet/"
 SRC_URI=""
 
 LICENSE="as-is"
-SLOT="2.3"
+SLOT="${PV}"
 KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND="=dev-java/tomcat-servlet-api-4*"
+RDEPEND="dev-java/tomcat-servlet-api:${SLOT}"
 DEPEND=""
 
-JAVA_VIRTUAL_PROVIDES="tomcat-servlet-api-2.3"
+JAVA_VIRTUAL_PROVIDES="tomcat-servlet-api-${SLOT}"
diff --git a/java-virtuals/servlet-api/servlet-api-2.4.ebuild b/java-virtuals/servlet-api/servlet-api-2.4.ebuild
index 67f0498d6523..19948a2c780b 100644
--- a/java-virtuals/servlet-api/servlet-api-2.4.ebuild
+++ b/java-virtuals/servlet-api/servlet-api-2.4.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/java-virtuals/servlet-api/servlet-api-2.4.ebuild,v 1.3 2008/01/09 07:05:37 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/java-virtuals/servlet-api/servlet-api-2.4.ebuild,v 1.4 2008/03/22 23:31:08 wltjr Exp $
+
+EAPI=1
 
 inherit java-virtuals-2
 
@@ -9,14 +11,14 @@ HOMEPAGE="http://java.sun.com/products/servlet/"
 SRC_URI=""
 
 LICENSE="as-is"
-SLOT="2.4"
+SLOT="${PV}"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="|| (
-		=dev-java/tomcat-servlet-api-5.5*
-		=dev-java/resin-servlet-api-3.0*
+		dev-java/tomcat-servlet-api:${SLOT}
+		dev-java/resin-servlet-api:${SLOT}
 	)"
 DEPEND=""
 
-JAVA_VIRTUAL_PROVIDES="tomcat-servlet-api-2.4 resin-servlet-api-2.4"
+JAVA_VIRTUAL_PROVIDES="tomcat-servlet-api-${SLOT} resin-servlet-api-${SLOT}"
diff --git a/java-virtuals/servlet-api/servlet-api-2.5.ebuild b/java-virtuals/servlet-api/servlet-api-2.5.ebuild
index 0a81e86cbe5f..c1906761ab2b 100644
--- a/java-virtuals/servlet-api/servlet-api-2.5.ebuild
+++ b/java-virtuals/servlet-api/servlet-api-2.5.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/java-virtuals/servlet-api/servlet-api-2.5.ebuild,v 1.4 2008/01/09 17:30:05 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/java-virtuals/servlet-api/servlet-api-2.5.ebuild,v 1.5 2008/03/22 23:31:08 wltjr Exp $
+
+EAPI=1
 
 inherit java-virtuals-2
 
@@ -9,14 +11,14 @@ HOMEPAGE="http://java.sun.com/products/servlet/"
 SRC_URI=""
 
 LICENSE="as-is"
-SLOT="2.5"
+SLOT="${PV}"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="|| (
-		=dev-java/tomcat-servlet-api-6.0*
-		=dev-java/resin-servlet-api-3.1*
+		dev-java/tomcat-servlet-api:${SLOT}
+		dev-java/resin-servlet-api:${SLOT}
 	)"
 DEPEND=""
 
-JAVA_VIRTUAL_PROVIDES="tomcat-servlet-api-2.5 resin-servlet-api-2.5"
+JAVA_VIRTUAL_PROVIDES="tomcat-servlet-api-${SLOT} resin-servlet-api-${SLOT}"