Migrate to EAPI 2.

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

3 files changed, 18 insertions, 20 deletions

diff --git a/sys-fs/loop-aes/ChangeLog b/sys-fs/loop-aes/ChangeLog
index 4e36aa149f06..7273cfea7889 100644
--- a/sys-fs/loop-aes/ChangeLog
+++ b/sys-fs/loop-aes/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/loop-aes
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/loop-aes/ChangeLog,v 1.38 2009/03/08 14:41:29 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/loop-aes/ChangeLog,v 1.39 2009/03/08 14:59:19 betelgeuse Exp $
+
+  08 Mar 2009; Petteri Räty <betelgeuse@gentoo.org> loop-aes-3.2c.ebuild,
+  loop-aes-3.2e.ebuild:
+  Migrate to EAPI 2.
 
   08 Mar 2009; Petteri Räty <betelgeuse@gentoo.org> -loop-aes-3.2d.ebuild:
   Remove old version.
diff --git a/sys-fs/loop-aes/loop-aes-3.2c.ebuild b/sys-fs/loop-aes/loop-aes-3.2c.ebuild
index 24e398e0cc1f..5454738932f7 100644
--- a/sys-fs/loop-aes/loop-aes-3.2c.ebuild
+++ b/sys-fs/loop-aes/loop-aes-3.2c.ebuild
@@ -1,6 +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/sys-fs/loop-aes/loop-aes-3.2c.ebuild,v 1.4 2008/05/09 22:22:35 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/loop-aes/loop-aes-3.2c.ebuild,v 1.5 2009/03/08 14:59:19 betelgeuse Exp $
+
+EAPI="2"
 
 inherit linux-mod
 
@@ -14,18 +16,13 @@ SLOT="0"
 IUSE="keyscrub padlock"
 KEYWORDS="amd64 ~hppa ~ppc x86"
 
-RDEPEND=">=sys-apps/util-linux-2.12r"
+UTIL=">=sys-apps/util-linux-2.12r"
+RDEPEND="|| ( ${UTIL}[crypt] ${UTIL}[loop-aes] )"
 DEPEND=""
 
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
-	if ! built_with_use sys-apps/util-linux crypt && \
-		! built_with_use sys-apps/util-linux loop-aes; then
-		eerror "loop-aes needs >=util-linux-2.12q-r1 compiled with crypt or loop-aes use-flag enabled!"
-		die "util-linux without crypt detected"
-	fi
-
 	linux-mod_pkg_setup
 
 	CONFIG_CHECK="!BLK_DEV_LOOP"
@@ -43,7 +40,7 @@ pkg_setup() {
 src_install() {
 	linux-mod_src_install
 
-	dodoc README
+	dodoc README || die
 	dobin loop-aes-keygen
 	doman loop-aes-keygen.1
 }
diff --git a/sys-fs/loop-aes/loop-aes-3.2e.ebuild b/sys-fs/loop-aes/loop-aes-3.2e.ebuild
index c931049cb9b6..c50f48ee8f75 100644
--- a/sys-fs/loop-aes/loop-aes-3.2e.ebuild
+++ b/sys-fs/loop-aes/loop-aes-3.2e.ebuild
@@ -1,6 +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/sys-fs/loop-aes/loop-aes-3.2e.ebuild,v 1.1 2008/11/06 08:20:45 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/loop-aes/loop-aes-3.2e.ebuild,v 1.2 2009/03/08 14:59:19 betelgeuse Exp $
+
+EAPI="2"
 
 inherit linux-mod
 
@@ -15,17 +17,12 @@ IUSE="keyscrub padlock"
 KEYWORDS="~amd64 ~hppa ~ppc ~x86"
 
 RDEPEND=">=sys-apps/util-linux-2.12r"
+RDEPEND="|| ( ${RDEPEND}[crypt] ${RDEPEND}[loop-aes] )"
 DEPEND=""
 
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
-	if ! built_with_use sys-apps/util-linux crypt && \
-		! built_with_use sys-apps/util-linux loop-aes; then
-		eerror "loop-aes needs >=util-linux-2.12q-r1 compiled with crypt or loop-aes use-flag enabled!"
-		die "util-linux without crypt detected"
-	fi
-
 	linux-mod_pkg_setup
 
 	CONFIG_CHECK="!BLK_DEV_LOOP"
@@ -43,7 +40,7 @@ pkg_setup() {
 src_install() {
 	linux-mod_src_install
 
-	dodoc README
+	dodoc README || die
 	dobin loop-aes-keygen
 	doman loop-aes-keygen.1
 }