sys-fs/loop-aes: Fix DEPEND in 3.6b[-r1] to address bug 370635. Version bump to 3.6c. Remove old ebuilds/patches.

(Portage version: 2.2.0_alpha38/cvs/Linux x86_64)

7 files changed, 30 insertions, 118 deletions

diff --git a/sys-fs/loop-aes/ChangeLog b/sys-fs/loop-aes/ChangeLog
index 72bad92a44a8..b4ac7c3359c1 100644
--- a/sys-fs/loop-aes/ChangeLog
+++ b/sys-fs/loop-aes/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-fs/loop-aes
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/loop-aes/ChangeLog,v 1.78 2011/06/08 13:13:16 c1pher Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/loop-aes/ChangeLog,v 1.79 2011/06/13 16:56:43 c1pher Exp $
+
+*loop-aes-3.6c (13 Jun 2011)
+
+  13 Jun 2011; Dane Smith <c1pher@gentoo.org> -loop-aes-3.5b.ebuild,
+  -loop-aes-3.6a.ebuild, loop-aes-3.6b.ebuild, loop-aes-3.6b-r1.ebuild,
+  +loop-aes-3.6c.ebuild, -files/loop-AES-v3.5b-20101231.diff:
+  *Change DEPEND in 3.6b[-r1] to require +loop-aes in util-linux.
+  Fixes bug 370635.
+  *Add new version 3.6c.
+  *Remove old versions / patches.
+  *Add myself to metadata that way I actually get CC'd on bugs.
 
 *loop-aes-3.6b-r1 (08 Jun 2011)
 
diff --git a/sys-fs/loop-aes/files/loop-AES-v3.5b-20101231.diff b/sys-fs/loop-aes/files/loop-AES-v3.5b-20101231.diff
deleted file mode 100644
index b654127eae05..000000000000
--- a/sys-fs/loop-aes/files/loop-AES-v3.5b-20101231.diff
+++ /dev/null
@@ -1,39 +0,0 @@
---- ../loop-AES-v3.5b/loop.c-2.6b.patched	2010-11-11 08:09:58.000000000 +0200
-+++ ./loop.c-2.6b.patched	2010-12-30 08:27:16.000000000 +0200
-@@ -1306,7 +1306,11 @@
- 	blk_queue_segment_boundary(lo->lo_queue, PAGE_CACHE_SIZE - 1);
- 	blk_queue_max_segments(lo->lo_queue, BLK_MAX_SEGMENTS);
- 	blk_queue_max_hw_sectors(lo->lo_queue, BLK_SAFE_MAX_SECTORS);
-+#if defined(QUEUE_FLAG_CLUSTER)
- 	lo->lo_queue->queue_flags &= ~(1 << QUEUE_FLAG_CLUSTER);
-+#else
-+	lo->lo_queue->limits.cluster = 0;
-+#endif
- 	blk_queue_flush(lo->lo_queue, 0);
- 
- 	/*
---- ../loop-AES-v3.5b/kernel-2.6.37-rc1.diff	2010-11-11 08:22:07.000000000 +0200
-+++ ./kernel-2.6.37-rc1.diff	2010-12-30 08:31:22.000000000 +0200
-@@ -76,8 +76,8 @@
-  
- diff -urN linux-2.6.37-rc1-noloop/drivers/block/loop.c linux-2.6.37-rc1-AES/drivers/block/loop.c
- --- linux-2.6.37-rc1-noloop/drivers/block/loop.c	1970-01-01 02:00:00.000000000 +0200
--+++ linux-2.6.37-rc1-AES/drivers/block/loop.c	2010-11-11 08:16:47.000000000 +0200
--@@ -0,0 +1,3133 @@
-++++ linux-2.6.37-rc1-AES/drivers/block/loop.c	2010-12-30 08:27:16.000000000 +0200
-+@@ -0,0 +1,3137 @@
- +/*
- + *  linux/drivers/block/loop.c
- + *
-@@ -2456,7 +2456,11 @@
- +	blk_queue_segment_boundary(lo->lo_queue, PAGE_CACHE_SIZE - 1);
- +	blk_queue_max_segments(lo->lo_queue, BLK_MAX_SEGMENTS);
- +	blk_queue_max_hw_sectors(lo->lo_queue, BLK_SAFE_MAX_SECTORS);
-++#if defined(QUEUE_FLAG_CLUSTER)
- +	lo->lo_queue->queue_flags &= ~(1 << QUEUE_FLAG_CLUSTER);
-++#else
-++	lo->lo_queue->limits.cluster = 0;
-++#endif
- +	blk_queue_flush(lo->lo_queue, 0);
- +
- +	/*
diff --git a/sys-fs/loop-aes/loop-aes-3.5b.ebuild b/sys-fs/loop-aes/loop-aes-3.5b.ebuild
deleted file mode 100644
index 8fa8ac95c928..000000000000
--- a/sys-fs/loop-aes/loop-aes-3.5b.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2011 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.5b.ebuild,v 1.5 2011/01/08 21:34:37 maekke Exp $
-
-EAPI="3"
-
-inherit eutils 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/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~ppc ~sparc x86"
-IUSE="extra-ciphers keyscrub padlock"
-
-DEPEND="|| ( >=sys-apps/util-linux-2.12r[crypt] >=sys-apps/util-linux-2.12r[loop-aes] )"
-RDEPEND="${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"
-
-	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_prepare() {
-	sed -e 's/make/$(MAKE)/g' -i Makefile || die "sed failed"
-
-	# http://loop-aes.sourceforge.net/updates/loop-AES-v3.5b-20101231.diff.bz2
-	epatch "${FILESDIR}/loop-AES-v3.5b-20101231.diff"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc README || die "dodoc failed"
-	dobin loop-aes-keygen || die "dobin failed"
-	doman loop-aes-keygen.1 || die "doman failed"
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	einfo
-	einfo "For more instructions take a look at examples in README at:"
-	einfo "'${EPREFIX}/usr/share/doc/${PF}'"
-	einfo
-}
diff --git a/sys-fs/loop-aes/loop-aes-3.6b-r1.ebuild b/sys-fs/loop-aes/loop-aes-3.6b-r1.ebuild
index c7b629a1f0e3..ceedc5cef531 100644
--- a/sys-fs/loop-aes/loop-aes-3.6b-r1.ebuild
+++ b/sys-fs/loop-aes/loop-aes-3.6b-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.6b-r1.ebuild,v 1.1 2011/06/08 13:13:16 c1pher Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/loop-aes/loop-aes-3.6b-r1.ebuild,v 1.2 2011/06/13 16:56:43 c1pher Exp $
 
 EAPI="3"
 
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
 IUSE="aes-ni extra-ciphers keyscrub padlock"
 
-DEPEND="|| ( >=sys-apps/util-linux-2.12r[crypt] >=sys-apps/util-linux-2.12r[loop-aes] )"
+DEPEND=">=sys-apps/util-linux-2.12r[crypt,loop-aes]"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/sys-fs/loop-aes/loop-aes-3.6b.ebuild b/sys-fs/loop-aes/loop-aes-3.6b.ebuild
index 9f9e19f2034a..431839b081fd 100644
--- a/sys-fs/loop-aes/loop-aes-3.6b.ebuild
+++ b/sys-fs/loop-aes/loop-aes-3.6b.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.6b.ebuild,v 1.4 2011/06/02 14:12:26 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/loop-aes/loop-aes-3.6b.ebuild,v 1.5 2011/06/13 16:56:43 c1pher Exp $
 
 EAPI="3"
 
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="amd64 arm ~hppa ~ppc ~sparc x86"
 IUSE="extra-ciphers keyscrub padlock"
 
-DEPEND="|| ( >=sys-apps/util-linux-2.12r[crypt] >=sys-apps/util-linux-2.12r[loop-aes] )"
+DEPEND=">=sys-apps/util-linux-2.12r[crypt,loop-aes]"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/sys-fs/loop-aes/loop-aes-3.6a.ebuild b/sys-fs/loop-aes/loop-aes-3.6c.ebuild
index b3cb9569782e..571d4a393921 100644
--- a/sys-fs/loop-aes/loop-aes-3.6a.ebuild
+++ b/sys-fs/loop-aes/loop-aes-3.6c.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.6a.ebuild,v 1.3 2011/04/19 13:28:30 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/loop-aes/loop-aes-3.6c.ebuild,v 1.1 2011/06/13 16:56:43 c1pher Exp $
 
 EAPI="3"
 
@@ -14,10 +14,10 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~sparc x86"
-IUSE="extra-ciphers keyscrub padlock"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
+IUSE="aes-ni extra-ciphers keyscrub padlock"
 
-DEPEND="|| ( >=sys-apps/util-linux-2.12r[crypt] >=sys-apps/util-linux-2.12r[loop-aes] )"
+DEPEND=">=sys-apps/util-linux-2.12r[crypt,loop-aes]"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
@@ -33,6 +33,7 @@ pkg_setup() {
 		LINUX_SOURCE=\"${KERNEL_DIR}\" \
 		KBUILD_OUTPUT=\"${KBUILD_OUTPUT}\" \
 		USE_KBUILD=y MODINST=n RUNDM=n"
+	use aes-ni && BUILD_PARAMS="${BUILD_PARAMS} INTELAES=y"
 	use keyscrub && BUILD_PARAMS="${BUILD_PARAMS} KEYSCRUB=y"
 	use padlock && BUILD_PARAMS="${BUILD_PARAMS} PADLOCK=y"
 
@@ -64,4 +65,9 @@ pkg_postinst() {
 	einfo "For more instructions take a look at examples in README at:"
 	einfo "'${EPREFIX}/usr/share/doc/${PF}'"
 	einfo
+	einfo "If you have a newer Intel processor (i5, i7), and you use AES"
+	einfo "you may want to consider using the aes-ni use flag. It will"
+	einfo "use your processors native AES instructions giving quite a speed"
+	einfo "increase."
+	einfo
 }
diff --git a/sys-fs/loop-aes/metadata.xml b/sys-fs/loop-aes/metadata.xml
index 57d37123fd8d..428ee6534692 100644
--- a/sys-fs/loop-aes/metadata.xml
+++ b/sys-fs/loop-aes/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>crypto</herd>
+	<maintainer>
+		<email>c1pher@gentoo.org</email>
+		<name>Dane Smith</name>
+	</maintainer>
 	<use>
 		<flag name='aes-ni'>Enable support for Intel's AES instruction
 			set</flag>