Version bump (bug #295625).

Package-Manager: portage-15044-svn/cvs/Linux x86_64

4 files changed, 21 insertions, 74 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/Manifest b/sys-fs/loop-aes/Manifest
index abc74ab8470f..91342501c081 100644
--- a/sys-fs/loop-aes/Manifest
+++ b/sys-fs/loop-aes/Manifest
@@ -1,18 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST loop-AES-v3.2e.tar.bz2 229532 RMD160 3ef1373492bd196e3c776e2420b078d11297846b SHA1 a30f565259e868828a9c69f22797fc80191f2acc SHA256 5bbdfa80e24bc49b5a113597a7dcedb92388ec5dd1330102c43d467b02f6e836
-DIST loop-AES-v3.2f.tar.bz2 229859 RMD160 2eb791780e8ff43dd04048c44dfc221ca3745dab SHA1 76237deab025def7c89678b126e676a03e210a26 SHA256 da30c3be07a852769248aa6aa698d1114330ce4750b48664c3602e6fbb3e324f
 DIST loop-AES-v3.2g.tar.bz2 232959 RMD160 018f52d60eb7532b7d4d1ea4b5a30770e63c3203 SHA1 d6def9e46a0bf25b2cb5218b4b127e0126605aeb SHA256 ee6ae6fc3f263e50580fb737d236d82e7bab298b7a7887575f54baacd8841437
-EBUILD loop-aes-3.2e.ebuild 1354 RMD160 12fbf107bfae96415c7cee4ab95c74ce3adf03cd SHA1 97fba2151ca95683620bbb437f44831388ef9021 SHA256 4d7909643e4a5dd8d5b19d58fa960ed9ef4d6a16d5f09bc0ab6f60c810d6a3b3
-EBUILD loop-aes-3.2f.ebuild 1356 RMD160 518b5a0a96474b6dd589647b6a360e616e6117d0 SHA1 650c49d4d8f4cd2afcbdbd1f3db853441633e141 SHA256 478969d123404c4b09c6cdf92c8c6807189bff15762181f1b4d26879ed381f3e
+DIST loop-AES-v3.2h.tar.bz2 235899 RMD160 4bd7bbe9fca31560dfa0c6671967637edf991181 SHA1 12717088a1af5ba6e4b223247443aabc7135a5cf SHA256 7aeeec1d65962c11b201997cf024a0d2700b9980286c5e1f57acfab938386c9b
 EBUILD loop-aes-3.2g.ebuild 1594 RMD160 fe086042778c47699e1d8dcbf8a3888c6b73d48c SHA1 5dd1cc4539cb4db985576828f624552d8085fe97 SHA256 5ad536aceecfb57f0d3b5955110def0e20a61892836c994261bbcbbc4df46c7e
-MISC ChangeLog 6414 RMD160 b44566bd735d0b6936ff7a20eb4411454b800c81 SHA1 143500e274af2714bee18ca9d730ce7f279feb4c SHA256 294c16c51a90294faff86fc546d52a6f142381d62460cfb184e94c18875931da
+EBUILD loop-aes-3.2h.ebuild 1599 RMD160 e757d82e70e5ffe57dde7c02d2faded963d48ab2 SHA1 8f642509be568a2fc7ea08958be13bc97966ef4e SHA256 5591f989400fcb512474d72e827e869c3f4dce98fabbc9ad06874635152a7856
+MISC ChangeLog 6622 RMD160 5b7bf8c30a7200b1ba507cb7985ed1ef8856e0f9 SHA1 301142e31f53c577739b9a0f59912bdeb8e069ae SHA256 064167a04f3735e8cf3f3c54fdb6480e7fabdde7da02636a0aafdf8df71df662
 MISC metadata.xml 461 RMD160 5c7cf2ea64a6e0c4519fbb596872b1feb6583143 SHA1 a0d63932ae4f7a3b7f61f6f4ad401e001f50badb SHA256 d7e451c7fb45124d41ed1949ba055aa798f4b54fe79a800a8406e0f82dde246b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkqJubIACgkQNQqtfCuFneM1+gCgibMojDEH7Eo8QUdXMS1OZzAl
-T+gAn1vdVKrPQ37/m+aqjKoxk+4eXKl0
-=nAme
------END PGP SIGNATURE-----
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() {