Migrate to EAPI 2.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.29-rc6 i686

4 files changed, 24 insertions, 26 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/Manifest b/sys-fs/loop-aes/Manifest
index 7fb6c75d7297..deff9c53e105 100644
--- a/sys-fs/loop-aes/Manifest
+++ b/sys-fs/loop-aes/Manifest
@@ -3,14 +3,14 @@ Hash: SHA1
 
 DIST loop-AES-v3.2c.tar.bz2 222421 RMD160 d6b3781103aa64aa6db738083ff2d1adb4f9ca8f SHA1 63102863459370e35f4edb26e83f548f8ce1a7bb SHA256 c0313b445cb41ef586ba9774fc7cbf41114d93064b3417cf8512da6f746d3542
 DIST loop-AES-v3.2e.tar.bz2 229532 RMD160 3ef1373492bd196e3c776e2420b078d11297846b SHA1 a30f565259e868828a9c69f22797fc80191f2acc SHA256 5bbdfa80e24bc49b5a113597a7dcedb92388ec5dd1330102c43d467b02f6e836
-EBUILD loop-aes-3.2c.ebuild 1532 RMD160 9a0a64805f9fe5ed3dbd96fd7d8517413b8176a7 SHA1 26ddcc077e29b70e7577ef854b30918deb355cd5 SHA256 341e21d464f2faf7920b944ac2471912082a54c216733345e32b2040d57ca787
-EBUILD loop-aes-3.2e.ebuild 1539 RMD160 7ad99ff380e84cfce452e6b1815480222988512a SHA1 06f6d8549eb44363d4fdbb479d4164b45afe3d01 SHA256 f6619854af30fd7c0521d60d18f5966a1fe1bc04d98f0d1380031138b2159ba1
-MISC ChangeLog 5235 RMD160 777aa4a5b7417fb2d29e6e48dcdc0c32864307f5 SHA1 1d8870fa4e2fd48845a5861eab82343453b8d6a6 SHA256 cc6fb6766db39b2d74f6729778451a5bf29541493ecce3f63356813472947bd9
+EBUILD loop-aes-3.2c.ebuild 1349 RMD160 6c39fc8a87349eff2b41ac815702330f6319bcd7 SHA1 323ff0b44dc15bbf541c2f552ad740019483b0f7 SHA256 c031c8f79f5c8676a08e3e4a9849c493b8d0b62919a751404f5062eb1a88462d
+EBUILD loop-aes-3.2e.ebuild 1360 RMD160 b7228c9f26cd84ae1e4ee525a93dddf8cb569e77 SHA1 66e293a2a672824a352e83fad0f81b24e72e64b8 SHA256 551f2eab8080f23518b6f1db86172b62b037431786636ef08e030e2b904a0d3c
+MISC ChangeLog 5356 RMD160 5c1fa2d1e122f113eed7eafc85866d1618c0701f SHA1 f2a5b5cafd8ca40c1bf5b5ff7807c3b683c6359a SHA256 966821f4cd2fa7e403992046f9fb0ccc818db795a99a8d5d8c8c74cc49aaba57
 MISC metadata.xml 404 RMD160 0f048d6f059dc1e3deebbf5b91dc2c4d7aa67cdd SHA1 e51467619065b66f854c18f3e28642d861a213cd SHA256 03edef16495f89608a3f5d359003be0e3a337be32906dc09da6e050a85457699
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkmz2XYACgkQcxLzpIGCsLTEKwCcCOTi0qE53QzYoUOEYUMj3eiV
-Lb0AoJuG/JSZzM7exWFhPPv1JcIbMIbL
-=hyST
+iEYEARECAAYFAkmz3aUACgkQcxLzpIGCsLSIIgCeJ85WiaBTNmvWd5R6NQed208i
+pacAn2KWM9XJeRbRHKT3+A9n7nfTK8kO
+=Evv1
 -----END PGP SIGNATURE-----
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
 }