Version bump (bug #295625).

(Portage version: 15044-svn/cvs/Linux x86_64)

3 files changed, 18 insertions, 59 deletions

diff --git a/sys-fs/loop-aes/ChangeLog b/sys-fs/loop-aes/ChangeLog
index e7b9123a4cef..a271419a6a47 100644
--- a/sys-fs/loop-aes/ChangeLog
+++ b/sys-fs/loop-aes/ChangeLog
@@ -1,6 +1,12 @@
 # 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.46 2009/08/17 20:12:29 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/loop-aes/ChangeLog,v 1.47 2009/12/12 03:49:59 arfrever Exp $
+
+*loop-aes-3.2h (12 Dec 2009)
+
+  12 Dec 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -loop-aes-3.2e.ebuild, -loop-aes-3.2f.ebuild, +loop-aes-3.2h.ebuild:
+  Version bump (bug #295625).
 
   17 Aug 2009; Christian Faulhammer <fauli@gentoo.org> loop-aes-3.2g.ebuild:
   stable x86, bug 279401
diff --git a/sys-fs/loop-aes/loop-aes-3.2f.ebuild b/sys-fs/loop-aes/loop-aes-3.2f.ebuild
deleted file mode 100644
index b215507ca380..000000000000
--- a/sys-fs/loop-aes/loop-aes-3.2f.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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.2f.ebuild,v 1.3 2009/07/20 02:03:16 darkside Exp $
-
-EAPI="2"
-
-inherit linux-mod
-
-MY_P="${PN/aes/AES}-v${PV}"
-DESCRIPTION="Linux kernel module to encrypt local file systems and disk partitions with AES cipher."
-HOMEPAGE="http://loop-aes.sourceforge.net/loop-AES.README"
-SRC_URI="mirror://sourceforge/loop-aes/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-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() {
-	linux-mod_pkg_setup
-
-	CONFIG_CHECK="!BLK_DEV_LOOP"
-	MODULE_NAMES="loop(block::tmp-d-kbuild)"
-	BUILD_TARGETS="all"
-
-	BUILD_PARAMS=" \
-		LINUX_SOURCE=\"${KERNEL_DIR}\" \
-		KBUILD_OUTPUT=\"${KBUILD_OUTPUT}\" \
-		USE_KBUILD=y MODINST=n RUNDM=n"
-	use keyscrub && BUILD_PARAMS="${BUILD_PARAMS} KEYSCRUB=y"
-	use padlock && BUILD_PARAMS="${BUILD_PARAMS} PADLOCK=y"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc README || die
-	dobin loop-aes-keygen
-	doman loop-aes-keygen.1
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	einfo ""
-	einfo "For more instructions take a look at examples in README at:"
-	einfo "/usr/share/doc/${PF}"
-	einfo ""
-}
diff --git a/sys-fs/loop-aes/loop-aes-3.2e.ebuild b/sys-fs/loop-aes/loop-aes-3.2h.ebuild
index b72f88c2132d..2aead48f78d3 100644
--- a/sys-fs/loop-aes/loop-aes-3.2e.ebuild
+++ b/sys-fs/loop-aes/loop-aes-3.2h.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2009/04/18 12:42:14 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/loop-aes/loop-aes-3.2h.ebuild,v 1.1 2009/12/12 03:49:59 arfrever Exp $
 
 EAPI="2"
 
@@ -13,8 +13,8 @@ SRC_URI="mirror://sourceforge/loop-aes/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="keyscrub padlock"
-KEYWORDS="amd64 ~hppa ~ppc x86"
+IUSE="extra-ciphers keyscrub padlock"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
 
 RDEPEND=">=sys-apps/util-linux-2.12r"
 RDEPEND="|| ( ${RDEPEND}[crypt] ${RDEPEND}[loop-aes] )"
@@ -35,6 +35,14 @@ pkg_setup() {
 		USE_KBUILD=y MODINST=n RUNDM=n"
 	use keyscrub && BUILD_PARAMS="${BUILD_PARAMS} KEYSCRUB=y"
 	use padlock && BUILD_PARAMS="${BUILD_PARAMS} PADLOCK=y"
+
+	if use extra-ciphers; then
+		MODULE_NAMES="${MODULE_NAMES}
+			loop_blowfish(block::tmp-d-kbuild)
+			loop_serpent(block::tmp-d-kbuild)
+			loop_twofish(block::tmp-d-kbuild)"
+		BUILD_PARAMS="${BUILD_PARAMS} EXTRA_CIPHERS=y"
+	fi
 }
 
 src_install() {