--- /usr/portage/sys-apps/util-linux/util-linux-2.12i-r1.ebuild	2004-11-16 03:37:50.000000000 +0100
+++ /usr/portage/local/sys-apps/util-linux/util-linux-2.12i-r2.ebuild	2004-11-17 23:20:45.207636024 +0100
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.12i-r1.ebuild,v 1.2 2004/11/16 02:28:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.12i-r1.ebuild,v 1.1 2004/11/14 08:46:54 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -11,20 +11,22 @@
 	crypt? (
 		mirror://gentoo/util-linux-2.12i-cryptoapi-losetup.patch.bz2
 		http://dev.gentoo.org/~vapier/dist/util-linux-2.12i-cryptoapi-losetup.patch.bz2
-	)"
-#	crypt? ( http://loop-aes.sourceforge.net/loop-AES/loop-AES-v${AES_VER}.tar.bz2 )
+	)
+	loop-aes? ( 
+		http://loop-aes.sourceforge.net/loop-AES/loop-AES-v${AES_VER}.tar.bz2 )"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="crypt nls static pam selinux perl"
+IUSE="crypt loop-aes nls static pam selinux perl"
 
 DEPEND="virtual/libc
 	>=sys-libs/ncurses-5.2-r2
 	>=sys-fs/e2fsprogs-1.34
 	selinux? ( sys-libs/libselinux )
 	pam? ( sys-apps/pam-login )
-	crypt? ( app-crypt/hashalot )"
+	crypt? ( app-crypt/hashalot )
+	loop-aes? ( sys-fs/loop-aes )"
 RDEPEND="${DEPEND}
 	perl? ( dev-lang/perl )
 	nls? ( sys-devel/gettext )"
@@ -35,8 +37,16 @@
 	unpack ${A}
 	cd ${S}
 
+	if use crypt && use loop-aes; then
+		eerror ""
+		eerror "Cryptoloop and loop-aes are incompatible with"
+		eerror "with each other. Please specify either crypt"
+		eerror "or loop-aes flag in USE, but not both"
+		eerror ""
+		die
+	fi
 	# crypto support, yummy #24458
-	#use crypt && epatch ${WORKDIR}/loop-AES-v${AES_VER}/util-linux-*.diff
+	use loop-aes && epatch ${WORKDIR}/loop-AES-v${AES_VER}/util-linux-2.12h.diff
 	use crypt && epatch ${WORKDIR}/util-linux-2.12i-cryptoapi-losetup.patch
 
 	# Fix rare failures with -j4 or higher