Migrate to EAPI 2.

(Portage version: 2.2_rc20/cvs/Linux 2.6.29-rc6 i686)

3 files changed, 25 insertions, 20 deletions

diff --git a/app-portage/layman/ChangeLog b/app-portage/layman/ChangeLog
index 5ce7e3bf20d1..12a77e184c43 100644
--- a/app-portage/layman/ChangeLog
+++ b/app-portage/layman/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-portage/layman
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.68 2009/03/07 19:58:00 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.69 2009/03/07 20:14:32 betelgeuse Exp $
+
+  07 Mar 2009; Petteri Räty <betelgeuse@gentoo.org> layman-1.1.1.ebuild,
+  layman-1.2.3.ebuild:
+  Migrate to EAPI 2.
 
   07 Mar 2009; Petteri Räty <betelgeuse@gentoo.org>
   -layman-1.1.1-r1.ebuild, -layman-1.2.0-r1.ebuild, -layman-1.2.2.ebuild:
diff --git a/app-portage/layman/layman-1.1.1.ebuild b/app-portage/layman/layman-1.1.1.ebuild
index 728799c3e156..c2ac9c695018 100644
--- a/app-portage/layman/layman-1.1.1.ebuild
+++ b/app-portage/layman/layman-1.1.1.ebuild
@@ -1,7 +1,8 @@
-# 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/app-portage/layman/layman-1.1.1.ebuild,v 1.11 2008/08/30 18:42:43 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-1.1.1.ebuild,v 1.12 2009/03/07 20:14:32 betelgeuse Exp $
 
+EAPI="2"
 NEED_PYTHON=2.5
 
 inherit eutils distutils
@@ -13,18 +14,16 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="test"
+IUSE="subversion test"
 
 DEPEND="test? ( dev-util/subversion )"
-RDEPEND=""
-
-pkg_setup() {
-	if has_version dev-util/subversion && \
-	(! built_with_use --missing true dev-util/subversion webdav || built_with_use --missing false dev-util/subversion nowebdav); then
-		eerror "You must rebuild your Subversion with support for WebDAV."
-		die "You must rebuild your Subversion with support for WebDAV"
-	fi
-}
+RDEPEND="
+	subversion? (
+		|| (
+			>=dev-util/subversion-1.5.4[webdav-neon]
+			>=dev-util/subversion-1.5.4[webdav-serf]
+		)
+	)"
 
 src_install() {
 
diff --git a/app-portage/layman/layman-1.2.3.ebuild b/app-portage/layman/layman-1.2.3.ebuild
index a239b8c856f5..a7576f07538a 100644
--- a/app-portage/layman/layman-1.2.3.ebuild
+++ b/app-portage/layman/layman-1.2.3.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-1.2.3.ebuild,v 1.2 2009/02/03 15:58:50 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-1.2.3.ebuild,v 1.3 2009/03/07 20:14:32 betelgeuse Exp $
+
+EAPI="2"
 
 inherit eutils distutils
 
@@ -16,14 +18,14 @@ IUSE="git subversion test"
 DEPEND="dev-python/pyxml
 	test? ( dev-util/subversion )"
 RDEPEND="git? ( dev-util/git )
-	subversion? ( dev-util/subversion )"
+	subversion? (
+		|| (
+			>=dev-util/subversion-1.5.4[webdav-neon]
+			>=dev-util/subversion-1.5.4[webdav-serf]
+		)
+	)"
 
 pkg_setup() {
-	if has_version dev-util/subversion && \
-	(! built_with_use --missing true dev-util/subversion webdav || built_with_use --missing false dev-util/subversion nowebdav); then
-		eerror "You must rebuild your Subversion with support for WebDAV."
-		die "You must rebuild your Subversion with support for WebDAV"
-	fi
 	if ! has_version dev-util/subversion; then
 		ewarn "You do not have dev-util/subversion installed!"
 		ewarn "While layman does not exactly depend on this"