From: Alon Bar-Lev Date: Fri, 23 Feb 2007 15:42:07 +0000 (+0000) Subject: Fix bug#168051, cleanup X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ec2b5561716e7cc467430870018bf2c23a5a4b3a;p=gentoo.git Fix bug#168051, cleanup Package-Manager: portage-2.1.2-r10 --- diff --git a/sys-fs/loop-aes/ChangeLog b/sys-fs/loop-aes/ChangeLog index 3e2ba44ca076..29800a6a5e6b 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-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/loop-aes/ChangeLog,v 1.19 2007/01/18 23:24:41 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/loop-aes/ChangeLog,v 1.20 2007/02/23 15:42:07 alonbl Exp $ + + 23 Feb 2007; Alon Bar-Lev -loop-aes-3.1d.ebuild, + loop-aes-3.1e.ebuild: + Fix bug#168051, cleanup 18 Jan 2007; Christian Faulhammer loop-aes-3.1e.ebuild: stable x86, bug #162521 diff --git a/sys-fs/loop-aes/Manifest b/sys-fs/loop-aes/Manifest index 45df57cc1c0d..a3a1f27bd6e1 100644 --- a/sys-fs/loop-aes/Manifest +++ b/sys-fs/loop-aes/Manifest @@ -1,34 +1,16 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -DIST loop-AES-v3.1d.tar.bz2 169228 RMD160 36707f6ed2f57dabd7278c9d6386a25c2c012d59 SHA1 0be0d2e4e70c79a53b2ac6462659c1e36d2e69e6 SHA256 05826b3238d5d9f134426cb8575496508205ef607e0a9075b50510c8e0e8a23c DIST loop-AES-v3.1e.tar.bz2 169664 RMD160 78a54330a343103900cc479d58645ec77563ded0 SHA1 10535c8279e55555686af9e39945ccff2434e44f SHA256 6b1d671a9e3cadeef7a8f391cda4b5b883d0d1bf91d08d2746af8e4780fdff9d -EBUILD loop-aes-3.1d.ebuild 1637 RMD160 7d0ea2de03b040b14ef42fb6ec844f5aedbc0c77 SHA1 2db871ff5b9e82ef25b2413ed6ad24cbb88d727c SHA256 e890c9d925c53de8ae87358c596151e5e8e43ae69bfd0ed6429cf002c7619dfd -MD5 12cbf962f3c94c5589e1871439006bc7 loop-aes-3.1d.ebuild 1637 -RMD160 7d0ea2de03b040b14ef42fb6ec844f5aedbc0c77 loop-aes-3.1d.ebuild 1637 -SHA256 e890c9d925c53de8ae87358c596151e5e8e43ae69bfd0ed6429cf002c7619dfd loop-aes-3.1d.ebuild 1637 -EBUILD loop-aes-3.1e.ebuild 1642 RMD160 5e76533ecd8a1077966f8d0a7ea638563494db2d SHA1 cdd219907edb58dd2a3c8999a0ab735f28d3430f SHA256 b2e90bba22982e9d318f05b76957386e419d71b4e4a4c44f71629fa6aa03a341 -MD5 fe56c3f80714137bb602177765160fa7 loop-aes-3.1e.ebuild 1642 -RMD160 5e76533ecd8a1077966f8d0a7ea638563494db2d loop-aes-3.1e.ebuild 1642 -SHA256 b2e90bba22982e9d318f05b76957386e419d71b4e4a4c44f71629fa6aa03a341 loop-aes-3.1e.ebuild 1642 -MISC ChangeLog 3125 RMD160 3faaceaeaaaf91affb20d8a2fbdbc70b909efe37 SHA1 ff9c20081a1b1cbe7dad19f268425b11180308f3 SHA256 417975168fd2b47d09a28fd63f90bd8af59d8edde9c4d003fd0423f6aa81ffdc -MD5 7a0edd17ecce1d3f2f44f434de5a7a2e ChangeLog 3125 -RMD160 3faaceaeaaaf91affb20d8a2fbdbc70b909efe37 ChangeLog 3125 -SHA256 417975168fd2b47d09a28fd63f90bd8af59d8edde9c4d003fd0423f6aa81ffdc ChangeLog 3125 +EBUILD loop-aes-3.1e.ebuild 1656 RMD160 8d9ed0f82d9f555f4d7f71cf8368f1b73e26b390 SHA1 00efb8632f2d3a2ceeec1a00d92bf33279d81064 SHA256 6a8ea71ecbd58de15feef71bf2be60a4be56a18480ed429abf2535cd56f053fd +MD5 adf105b254acb02816d8c4c99e0683a9 loop-aes-3.1e.ebuild 1656 +RMD160 8d9ed0f82d9f555f4d7f71cf8368f1b73e26b390 loop-aes-3.1e.ebuild 1656 +SHA256 6a8ea71ecbd58de15feef71bf2be60a4be56a18480ed429abf2535cd56f053fd loop-aes-3.1e.ebuild 1656 +MISC ChangeLog 3248 RMD160 b050ff67b9079dc376c375575f2ce63b7fc9ecb7 SHA1 bf386bba977d5ad226fc6cb575b6aba0d4041b0f SHA256 3da8f7ad3e84e672bbe7a9d981d54797af0ea5101448ab6aa917265bb7eaf7f5 +MD5 817927781884c15a9951c4a32c470068 ChangeLog 3248 +RMD160 b050ff67b9079dc376c375575f2ce63b7fc9ecb7 ChangeLog 3248 +SHA256 3da8f7ad3e84e672bbe7a9d981d54797af0ea5101448ab6aa917265bb7eaf7f5 ChangeLog 3248 MISC metadata.xml 161 RMD160 6c637fd30ecc003215a4c5def28f2ac1557f8b3b SHA1 a8e55fb59c54f7c33414e092d6707c4358b94002 SHA256 e7850bdf6224d44969b4266b0ed7dba90912b12552e86230ac6729dd973f005d MD5 d0429d60e519907ea2f667002b38156b metadata.xml 161 RMD160 6c637fd30ecc003215a4c5def28f2ac1557f8b3b metadata.xml 161 SHA256 e7850bdf6224d44969b4266b0ed7dba90912b12552e86230ac6729dd973f005d metadata.xml 161 -MD5 3a86a9d4b734fa054530228e7724ab97 files/digest-loop-aes-3.1d 247 -RMD160 c4dc8f6a72a3a8d3a9ee0078960b06052c8f7727 files/digest-loop-aes-3.1d 247 -SHA256 0085d8d2847ccfe58364b63721e72b0caef9a90158932322ced8eea70fc78a78 files/digest-loop-aes-3.1d 247 MD5 da55984d097e89c17d48d5c8f34257f2 files/digest-loop-aes-3.1e 247 RMD160 f733a91211bfe7c4503d3b72db9e7808d0a581aa files/digest-loop-aes-3.1e 247 SHA256 639f282c3e471b9838ad6abbcf5fb73648d86ac97aa99f4667f685a5d15cb863 files/digest-loop-aes-3.1e 247 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) - -iD8DBQFFsAGhNQqtfCuFneMRAszzAJ44sm3YbU5EKo98KFO/JKNwdvI5SgCghIP/ -lzyI4iT360Or+09RF8sWjDY= -=Xk33 ------END PGP SIGNATURE----- diff --git a/sys-fs/loop-aes/files/digest-loop-aes-3.1d b/sys-fs/loop-aes/files/digest-loop-aes-3.1d deleted file mode 100644 index 9f2b1ddf36cc..000000000000 --- a/sys-fs/loop-aes/files/digest-loop-aes-3.1d +++ /dev/null @@ -1,3 +0,0 @@ -MD5 b4d13d6421382ea048e113ad8a868dfa loop-AES-v3.1d.tar.bz2 169228 -RMD160 36707f6ed2f57dabd7278c9d6386a25c2c012d59 loop-AES-v3.1d.tar.bz2 169228 -SHA256 05826b3238d5d9f134426cb8575496508205ef607e0a9075b50510c8e0e8a23c loop-AES-v3.1d.tar.bz2 169228 diff --git a/sys-fs/loop-aes/loop-aes-3.1d.ebuild b/sys-fs/loop-aes/loop-aes-3.1d.ebuild deleted file mode 100644 index 9c7189553125..000000000000 --- a/sys-fs/loop-aes/loop-aes-3.1d.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2006 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.1d.ebuild,v 1.4 2006/10/04 15:51:53 genstef Exp $ - -inherit linux-mod eutils - -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" - -S="${WORKDIR}/${MY_P}" - -CONFIG_CHECK="!BLK_DEV_LOOP" -MODULE_NAMES="loop(block:)" -BUILD_TARGETS="all" - -RDEPEND=">=sys-apps/util-linux-2.12r" - -pkg_setup() { - if ! built_with_use sys-apps/util-linux crypt; then - eerror "loop-aes needs >=util-linux-2.12q-r1 compiled with crypt use-flag enabled!" - die "util-linux without crypt detected" - fi - - linux-mod_pkg_setup - - if ! linux_chkconfig_present KMOD && \ - ! linux_chkconfig_present KERNELD - then - ewarn "" - ewarn "It is recommended to have Automatic kernel module loading" - ewarn "(CONFIG_KERNELD in kernels 2.0 or CONFIG_KMOD in newer)" - ewarn "" - fi - - BUILD_PARAMS="LINUX_SOURCE=${KV_DIR} MODINST=n RUNDM=n" - use keyscrub && BUILD_PARAMS="${BUILD_PARAMS} KEYSCRUB=y" - use padlock && BUILD_PARAMS="${BUILD_PARAMS} PADLOCK=y" -} - -src_unpack () { - unpack ${A} - convert_to_m ${S}/Makefile -} - -src_install() { - linux-mod_src_install - - dodoc README -} - -pkg_postinst() { - linux-mod_pkg_postinst - - einfo "" - einfo "For more instructions take a look at examples in" - einfo "/usr/share/doc/${PF}/README.gz" - einfo "" -} diff --git a/sys-fs/loop-aes/loop-aes-3.1e.ebuild b/sys-fs/loop-aes/loop-aes-3.1e.ebuild index ff6d2837814c..1abe1722d421 100644 --- a/sys-fs/loop-aes/loop-aes-3.1e.ebuild +++ b/sys-fs/loop-aes/loop-aes-3.1e.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 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.1e.ebuild,v 1.4 2007/01/18 23:24:41 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/loop-aes/loop-aes-3.1e.ebuild,v 1.5 2007/02/23 15:42:07 alonbl Exp $ inherit linux-mod eutils @@ -14,13 +14,10 @@ SLOT="0" IUSE="keyscrub padlock" KEYWORDS="~amd64 ~hppa ~ppc x86" -S="${WORKDIR}/${MY_P}" - -CONFIG_CHECK="!BLK_DEV_LOOP" -MODULE_NAMES="loop(block:tmp-d-kbuild)" -BUILD_TARGETS="all" - RDEPEND=">=sys-apps/util-linux-2.12r" +DEPEND="" + +S="${WORKDIR}/${MY_P}" pkg_setup() { if ! built_with_use sys-apps/util-linux crypt; then @@ -39,6 +36,10 @@ pkg_setup() { ewarn "" fi + 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}