Cleanup old versions.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

9 files changed, 9 insertions, 683 deletions

diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog
index e395aa7e4480..2bb2a6b663b4 100644
--- a/sys-fs/cryptsetup/ChangeLog
+++ b/sys-fs/cryptsetup/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/cryptsetup
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.89 2010/07/27 18:52:25 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.90 2010/07/27 19:39:18 robbat2 Exp $
+
+  27 Jul 2010; Robin H. Johnson <robbat2@gentoo.org>
+  -cryptsetup-1.0.5-r1.ebuild, -cryptsetup-1.0.7.ebuild,
+  -cryptsetup-1.0.7-r1.ebuild, -cryptsetup-1.1.0.ebuild,
+  -cryptsetup-1.1.1_rc1.ebuild, -cryptsetup-1.1.1_rc2.ebuild,
+  -cryptsetup-1.1.1.ebuild:
+  Cleanup old versions.
 
   27 Jul 2010; Robin H. Johnson <robbat2@gentoo.org>
   cryptsetup-1.1.2.ebuild, cryptsetup-1.1.3.ebuild:
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 866df26e9211..41638019095f 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -12,25 +12,12 @@ AUX cryptsetup-libmapper.patch 297 RMD160 1f5a19f125147797db69f4fb75d6abe36743d5
 AUX dm-crypt-start.sh 3939 RMD160 b8e77d42b9f5df01cb04f320d7b983855626b39b SHA1 1af1421b687626dae63781f4d78736522d641984 SHA256 2a6114349008ce7d438dae7adcdcd35fdfafa7d54f73d811812c29938865f651
 AUX dm-crypt-stop.sh 1290 RMD160 ccd5c5f25b01a6c80228609c97d4e25136098ff6 SHA1 0f9c13e12b4310a190d5db48d4fd32267b795094 SHA256 944e2227b1125902acfa322373dda67d13998ac2d0af075810986471fcbca5a9
 DIST cryptsetup-0.1.tar.bz2 249013 RMD160 0657a5750e32e059e3a2ad10b3de0027d616442b SHA1 b371113b266e4cdffe36fd9e3be753e4adc9f766 SHA256 421c9eb1771f8e3f61eb1b21843032b4f30f6b2cfac66a800980a2b65bdad5b7
-DIST cryptsetup-1.0.5.tar.bz2 322394 RMD160 99d9b0090b297b1bc2c72c064f091c8b2f322f70 SHA1 3e275fa67e761f6ed229ecfe831dd8a7da4be4b4 SHA256 4bab529afa00cafde3bc5df2769578c88438f80c5152d4257cd0e86986f95bc4
 DIST cryptsetup-1.0.6.tar.bz2 405713 RMD160 7ec056cf80fd25a782d3f6cc345858cf4ea988ec SHA1 dd45ad6a29c2e9af83c2c1525b02d7af88ab7212 SHA256 df7fda80cfa01f063caf39140287a47d018dfe056fc71a3ba605e690ff0183fd
-DIST cryptsetup-1.0.7.tar.bz2 417339 RMD160 0b903f14b672dfb74116864886370852c66ec425 SHA1 d955a8149d19bc9f09f20bf89f4a39771e6f5de7 SHA256 829af59ab5bb47e4ff384a927458b4ffbb86380825de5f9ac751a89df599ed99
-DIST cryptsetup-1.1.0.tar.bz2 465778 RMD160 c4e649bd8749507ee43e639f62cf2d28cc6ae412 SHA1 e28a4ec4ff9ec82eb1f4660f49cc63bf3538e4b7 SHA256 b343fa6bf3c48b633e68da25e44aebd6a32a3dc21c10604acd6faa04e41f58f3
-DIST cryptsetup-1.1.1-rc1.tar.bz2 476097 RMD160 c4ec17a7495f138098b76f52115238298740b263 SHA1 0d52bd4a152b066b37224773e642e36c1d52d79d SHA256 98720aa760741652e5280edfd5e03208a7e407c505d3ee3e9056dbb7712f0dc2
-DIST cryptsetup-1.1.1-rc2.tar.bz2 477360 RMD160 16783ebc67b629b77959c80d7bcac9a2ca700cab SHA1 2d45cb255d4601d7f921ba0e30d0d0564b509042 SHA256 02875d87ab1957a0f53f421eac0154a72c45564d88c10f59a013e6c449f68f55
-DIST cryptsetup-1.1.1.tar.bz2 477800 RMD160 b402d9927280f5bc4018aab95f5063874aeb6bbc SHA1 cd2684ebc8fc7b23019d9102ed742699b037afe1 SHA256 a0d07cfc03d3a12d54e68eebb509e6ce45bbd5169ae277256ea7bd165cc246bd
 DIST cryptsetup-1.1.2.tar.bz2 478501 RMD160 2488fb603edb73cfc99726c59d44530ac006b4d9 SHA1 270580572c413facee359b29e5886ff2b4e6de1c SHA256 45972839fbb169b3ad5649454c217b7f5b0b3c8bf07e32f51a334a88217c7293
 DIST cryptsetup-1.1.3.tar.bz2 499276 RMD160 bf2e724779174a3cd6ce9d592e17c70979f26e85 SHA1 6f8a4c9a80a0d25f8492dfce6db6abed221598f6 SHA256 9c8e68a272f6d9cfb6cd65cc0743f4c44a2096c61f74e0602bf40208b5e69c0a
 EBUILD cryptsetup-0.1-r3.ebuild 1882 RMD160 cba167af414ab6349b172c5c8d6449ba7228458a SHA1 f9a70a151fdd2cb7e3591514f583c066e4899c0b SHA256 ffee91a66e88d879e3f6bfee3ab97e97b6735315e0d9c81d8b2ec005dcf8d473
-EBUILD cryptsetup-1.0.5-r1.ebuild 2967 RMD160 e3d53062c60387d7ed59c864a842de457f031d3f SHA1 4a603cb45fe4cf249cc6a75413d3e14481098b6e SHA256 4f305ccb9c8432becb2e4a42859305aa642d3df8c8ed04b78c5dca4f839bead7
 EBUILD cryptsetup-1.0.6-r2.ebuild 3150 RMD160 997496f32ffb972a4d21efb80cb0ccedf2a53197 SHA1 8cbe4f6a69a72faf4916f1992a4ee3febd04114e SHA256 cad92c053518bb11a2acd9e806e471117c462187c8a02f5258e933e093ab2a66
-EBUILD cryptsetup-1.0.7-r1.ebuild 3018 RMD160 2287bad817297bdfd972f3a8747d3c70be3955c6 SHA1 2cdd53dc478dfba7fba3050a2b134b52a1b65489 SHA256 7886a41d8aec79ef373a815f9860a57fbcbdf08a0323eee92cae45f423164f4d
-EBUILD cryptsetup-1.0.7.ebuild 3056 RMD160 69eb9e5572e3e0a4492dc4f470c067dc660e0a80 SHA1 777fc921347d9d4cc3f295b6021ea7aa822bed80 SHA256 bb6659123697cd5911e0535bcc913a2ad7c649f6458e29ded30304af5dd6eb01
-EBUILD cryptsetup-1.1.0.ebuild 2952 RMD160 4f790c0b7388319bc4935237a301868f443b0303 SHA1 23859d8a72aea30d92ac5c6ed63c8d63648fe6ac SHA256 7d90181d116cf2debeec1b17e4bd5e6ee12b3823f8e6af4c11a7e80ba209c0cf
-EBUILD cryptsetup-1.1.1.ebuild 3036 RMD160 5eedec40850803a392daa6c0aac49a63a71b6d16 SHA1 a235c590162ae92d0d66ae0b235cb830d6982d00 SHA256 eff000a0955f4833ee49651ba74b6727c735fb1aa4dd15a4cb34defaee198444
-EBUILD cryptsetup-1.1.1_rc1.ebuild 2982 RMD160 744e8fcac011ecfd11def3149c5bcdd47087dba6 SHA1 89bb9d0376786cf70c5c9a7d5ab2e9174bb935a7 SHA256 eb5b16906624d610acd7daf251b6280f733dfe4e9e2d74e691afbf85520e8d92
-EBUILD cryptsetup-1.1.1_rc2.ebuild 3040 RMD160 e512e3d3980727f682c63db686a59123a937deb1 SHA1 11d24b1493be4087f2b8b1577154106a40072616 SHA256 8400b3ac19c3178b6c55218c51b8e11962a4d97dba070c80da8940a25a696ea9
 EBUILD cryptsetup-1.1.2.ebuild 3395 RMD160 5d674f7fa1eb079bad17f34edc84caf8a754cd64 SHA1 ba88abe3fde0cbf5a8d1c62822b889d48024b518 SHA256 874ff4f33c6e9843da09098debb879692442de27660746bb10ae0c691860d88e
 EBUILD cryptsetup-1.1.3.ebuild 3397 RMD160 40eab87e9d566cf807d7d7c1d274cb82a3f19812 SHA1 0bcbb75cf10c9221432b8aae34d67993bbe74ea3 SHA256 1270c0f6df14ffb46cb97760863743160ae1520e18c133a2969661e9a3b1d1e4
-MISC ChangeLog 12808 RMD160 144a4824ba618ab6ea53877253fa6c502b830a38 SHA1 88c7951b82645a5659f514f2a767c0f5c4364b95 SHA256 0f5f3d2f011354a346c7ff29484866a79259bfbb1eaf7a23720bd59e13c26d8f
+MISC ChangeLog 13090 RMD160 c46dbe23fed50e9da298fa34d7e172197281dda2 SHA1 e91ae6c6a8b938e6bb153b58272faf9eb0c2ea53 SHA256 9b912046542d9bf6044c0ffd37d3aad01b234e19c93e575df60190cef9b776c2
 MISC metadata.xml 239 RMD160 81512c49e64b6e70c7b746ba09d3e6fce4c7bc89 SHA1 c4085a72e46fe6bcea5bdff780007791eae6db4b SHA256 aebd5282fb892100f348eba1ed27edd27e7296356897c6f5314674f8abb4b51a
diff --git a/sys-fs/cryptsetup/cryptsetup-1.0.5-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-1.0.5-r1.ebuild
deleted file mode 100644
index c280904bdb92..000000000000
--- a/sys-fs/cryptsetup/cryptsetup-1.0.5-r1.ebuild
+++ /dev/null
@@ -1,102 +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/cryptsetup/cryptsetup-1.0.5-r1.ebuild,v 1.16 2009/04/19 18:41:07 cardoe Exp $
-
-inherit linux-info eutils flag-o-matic multilib
-
-DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
-HOMEPAGE="http://luks.endorphin.org/"
-SRC_URI="http://luks.endorphin.org/source/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="dynamic nls selinux"
-
-DEPEND="|| (
-		>=sys-fs/lvm2-2.02.45
-		>=sys-fs/device-mapper-1.00.07-r1
-	)
-	>=dev-libs/libgcrypt-1.1.42
-	>=dev-libs/libgpg-error-1.0-r1
-	>=dev-libs/popt-1.7
-	sys-fs/udev
-	|| ( >=sys-libs/e2fsprogs-libs-1.41 <sys-fs/e2fsprogs-1.41 )
-	selinux? ( sys-libs/libselinux )
-	!>=sys-fs/udev-126
-	!sys-fs/cryptsetup-luks"
-
-dm-crypt_check() {
-	local CONFIG_CHECK="~DM_CRYPT"
-	local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
-	check_extra_config
-}
-
-crypto_check() {
-	local CONFIG_CHECK="~CRYPTO"
-	local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n"
-	check_extra_config
-}
-
-cbc_check() {
-	local CONFIG_CHECK="~CRYPTO_CBC"
-	local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n"
-	check_extra_config
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-}
-
-pkg_setup() {
-	dm-crypt_check
-	crypto_check
-	cbc_check
-}
-
-src_compile() {
-	if use dynamic ; then
-		ewarn "If you need cryptsetup for an initrd or initramfs then you"
-		ewarn "should NOT use the dynamic USE flag"
-		epause 5
-	fi
-
-	econf \
-		--sbindir=/sbin \
-		$(use_enable !dynamic static) \
-		--libdir=/usr/$(get_libdir) \
-		$(use_enable nls) \
-		$(use_enable selinux) \
-		|| die
-
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	rmdir "${D}"/usr/$(get_libdir)/cryptsetup
-	insinto /lib/rcscripts/addons
-	newins "${FILESDIR}"/1.0.5-dm-crypt-start.sh dm-crypt-start.sh || die
-	newins "${FILESDIR}"/1.0.5-dm-crypt-stop.sh dm-crypt-stop.sh || die
-	newconfd "${FILESDIR}"/1.0.5-dmcrypt.confd dmcrypt || die
-	newinitd "${FILESDIR}"/1.0.5-dmcrypt.rc dmcrypt || die
-}
-
-pkg_postinst() {
-	ewarn "This ebuild introduces a new set of scripts and configuration"
-	ewarn "than the last version. If you are currently using /etc/conf.d/cryptfs"
-	ewarn "then you *MUST* copy your old file to:"
-	ewarn "/etc/conf.d/dmcrypt"
-	ewarn "Or your encrypted partitions will *NOT* work."
-	elog "Please see the example for configuring a LUKS mountpoint"
-	elog "in /etc/conf.d/dmcrypt"
-	elog
-	elog "If you are using baselayout-2 then please do:"
-	elog "rc-update add dmcrypt boot"
-	elog "This version introduces a command line arguement 'key_timeout'."
-	elog "If you want the search for the removable key device to timeout"
-	elog "after 10 seconds add the following to your bootloader config:"
-	elog "key_timeout=10"
-	elog "A timeout of 0 will mean it will wait indefinitely."
-}
diff --git a/sys-fs/cryptsetup/cryptsetup-1.0.7-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-1.0.7-r1.ebuild
deleted file mode 100644
index c3105a3cce38..000000000000
--- a/sys-fs/cryptsetup/cryptsetup-1.0.7-r1.ebuild
+++ /dev/null
@@ -1,96 +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/cryptsetup/cryptsetup-1.0.7-r1.ebuild,v 1.1 2009/11/30 00:53:54 robbat2 Exp $
-
-EAPI=2
-
-inherit linux-info eutils flag-o-matic multilib
-
-DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
-HOMEPAGE="http://luks.endorphin.org/ http://code.google.com/p/cryptsetup/"
-SRC_URI="http://cryptsetup.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="dynamic nls selinux"
-
-DEPEND="
-	>=sys-fs/lvm2-2.02.56-r1
-	>=dev-libs/libgcrypt-1.1.42
-	>=dev-libs/libgpg-error-1.0-r1
-	>=dev-libs/popt-1.7
-	>=sys-fs/udev-124
-	|| ( >=sys-libs/e2fsprogs-libs-1.41 <sys-fs/e2fsprogs-1.41 )
-	selinux? ( sys-libs/libselinux )
-	!sys-fs/cryptsetup-luks"
-
-dm-crypt_check() {
-	local CONFIG_CHECK="~DM_CRYPT"
-	local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
-	check_extra_config
-}
-
-crypto_check() {
-	local CONFIG_CHECK="~CRYPTO"
-	local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n"
-	check_extra_config
-}
-
-cbc_check() {
-	local CONFIG_CHECK="~CRYPTO_CBC"
-	local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n"
-	check_extra_config
-}
-
-pkg_setup() {
-	dm-crypt_check
-	crypto_check
-	cbc_check
-
-	if use dynamic ; then
-		ewarn "If you need cryptsetup for an initrd or initramfs then you"
-		ewarn "should NOT use the dynamic USE flag"
-		epause 5
-	fi
-}
-
-src_configure() {
-	use selinux || export ac_cv_lib_selinux_is_selinux_enabled=no
-	econf \
-		--sbindir=/sbin \
-		$(use_enable !dynamic static) \
-		--enable-libgcrypt \
-		--enable-libdevmapper \
-		--libdir=/usr/$(get_libdir) \
-		$(use_enable nls) \
-		|| die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	rmdir "${D}"/usr/$(get_libdir)/cryptsetup
-	insinto /$(get_libdir)/rcscripts/addons
-	newins "${FILESDIR}"/1.0.6-r2-dm-crypt-start.sh dm-crypt-start.sh || die
-	newins "${FILESDIR}"/1.0.5-dm-crypt-stop.sh dm-crypt-stop.sh || die
-	newconfd "${FILESDIR}"/1.0.6-dmcrypt.confd dmcrypt || die
-	newinitd "${FILESDIR}"/1.0.5-dmcrypt.rc dmcrypt || die
-}
-
-pkg_postinst() {
-	ewarn "This ebuild introduces a new set of scripts and configuration"
-	ewarn "than the last version. If you are currently using /etc/conf.d/cryptfs"
-	ewarn "then you *MUST* copy your old file to:"
-	ewarn "/etc/conf.d/dmcrypt"
-	ewarn "Or your encrypted partitions will *NOT* work."
-	elog "Please see the example for configuring a LUKS mountpoint"
-	elog "in /etc/conf.d/dmcrypt"
-	elog
-	elog "If you are using baselayout-2 then please do:"
-	elog "rc-update add dmcrypt boot"
-	elog "This version introduces a command line arguement 'key_timeout'."
-	elog "If you want the search for the removable key device to timeout"
-	elog "after 10 seconds add the following to your bootloader config:"
-	elog "key_timeout=10"
-	elog "A timeout of 0 will mean it will wait indefinitely."
-}
diff --git a/sys-fs/cryptsetup/cryptsetup-1.0.7.ebuild b/sys-fs/cryptsetup/cryptsetup-1.0.7.ebuild
deleted file mode 100644
index fa83dbc9429e..000000000000
--- a/sys-fs/cryptsetup/cryptsetup-1.0.7.ebuild
+++ /dev/null
@@ -1,98 +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/cryptsetup/cryptsetup-1.0.7.ebuild,v 1.1 2009/11/28 00:32:54 robbat2 Exp $
-
-EAPI=2
-
-inherit linux-info eutils flag-o-matic multilib
-
-DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
-HOMEPAGE="http://luks.endorphin.org/ http://code.google.com/p/cryptsetup/"
-SRC_URI="http://cryptsetup.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="dynamic nls selinux"
-
-DEPEND="|| (
-		>=sys-fs/lvm2-2.02.45
-		>=sys-fs/device-mapper-1.00.07-r1
-	)
-	>=dev-libs/libgcrypt-1.1.42
-	>=dev-libs/libgpg-error-1.0-r1
-	>=dev-libs/popt-1.7
-	>=sys-fs/udev-124
-	|| ( >=sys-libs/e2fsprogs-libs-1.41 <sys-fs/e2fsprogs-1.41 )
-	selinux? ( sys-libs/libselinux )
-	!sys-fs/cryptsetup-luks"
-
-dm-crypt_check() {
-	local CONFIG_CHECK="~DM_CRYPT"
-	local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
-	check_extra_config
-}
-
-crypto_check() {
-	local CONFIG_CHECK="~CRYPTO"
-	local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n"
-	check_extra_config
-}
-
-cbc_check() {
-	local CONFIG_CHECK="~CRYPTO_CBC"
-	local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n"
-	check_extra_config
-}
-
-pkg_setup() {
-	dm-crypt_check
-	crypto_check
-	cbc_check
-
-	if use dynamic ; then
-		ewarn "If you need cryptsetup for an initrd or initramfs then you"
-		ewarn "should NOT use the dynamic USE flag"
-		epause 5
-	fi
-}
-
-src_configure() {
-	use selinux || export ac_cv_lib_selinux_is_selinux_enabled=no
-	econf \
-		--sbindir=/sbin \
-		$(use_enable !dynamic static) \
-		--enable-libgcrypt \
-		--enable-libdevmapper \
-		--libdir=/usr/$(get_libdir) \
-		$(use_enable nls) \
-		|| die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	rmdir "${D}"/usr/$(get_libdir)/cryptsetup
-	insinto /$(get_libdir)/rcscripts/addons
-	newins "${FILESDIR}"/1.0.6-r2-dm-crypt-start.sh dm-crypt-start.sh || die
-	newins "${FILESDIR}"/1.0.5-dm-crypt-stop.sh dm-crypt-stop.sh || die
-	newconfd "${FILESDIR}"/1.0.6-dmcrypt.confd dmcrypt || die
-	newinitd "${FILESDIR}"/1.0.5-dmcrypt.rc dmcrypt || die
-}
-
-pkg_postinst() {
-	ewarn "This ebuild introduces a new set of scripts and configuration"
-	ewarn "than the last version. If you are currently using /etc/conf.d/cryptfs"
-	ewarn "then you *MUST* copy your old file to:"
-	ewarn "/etc/conf.d/dmcrypt"
-	ewarn "Or your encrypted partitions will *NOT* work."
-	elog "Please see the example for configuring a LUKS mountpoint"
-	elog "in /etc/conf.d/dmcrypt"
-	elog
-	elog "If you are using baselayout-2 then please do:"
-	elog "rc-update add dmcrypt boot"
-	elog "This version introduces a command line arguement 'key_timeout'."
-	elog "If you want the search for the removable key device to timeout"
-	elog "after 10 seconds add the following to your bootloader config:"
-	elog "key_timeout=10"
-	elog "A timeout of 0 will mean it will wait indefinitely."
-}
diff --git a/sys-fs/cryptsetup/cryptsetup-1.1.0.ebuild b/sys-fs/cryptsetup/cryptsetup-1.1.0.ebuild
deleted file mode 100644
index 4744e5b10903..000000000000
--- a/sys-fs/cryptsetup/cryptsetup-1.1.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.1.0.ebuild,v 1.2 2010/04/23 19:35:04 robbat2 Exp $
-
-EAPI=2
-
-inherit linux-info eutils flag-o-matic multilib autotools
-
-MY_P=${P/_rc/-rc}
-DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
-HOMEPAGE="http://code.google.com/p/cryptsetup/"
-SRC_URI="http://cryptsetup.googlecode.com/files/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="dynamic nls selinux"
-
-S=${WORKDIR}/${MY_P}
-
-DEPEND=">=sys-fs/lvm2-2.02.56-r1
-	>=dev-libs/libgcrypt-1.1.42
-	>=dev-libs/libgpg-error-1.0-r1
-	>=dev-libs/popt-1.7
-	>=sys-fs/udev-124
-	|| ( >=sys-libs/e2fsprogs-libs-1.41 <sys-fs/e2fsprogs-1.41 )
-	selinux? ( sys-libs/libselinux )
-	!sys-fs/cryptsetup-luks"
-
-pkg_setup() {
-	local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC"
-	local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
-	local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n"
-	local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n"
-	check_extra_config
-
-	if use dynamic ; then
-		ewarn "If you need cryptsetup for an initrd or initramfs then you"
-		ewarn "should NOT use the dynamic USE flag"
-		epause 5
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/1.1.0_rc3-static-no-selinux.patch
-	epatch "${FILESDIR}"/1.1.0-libudev.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--sbindir=/sbin \
-		--enable-shared \
-		$(use_enable !dynamic static) \
-		--libdir=/usr/$(get_libdir) \
-		$(use_enable nls) \
-		$(use_enable selinux) \
-		|| die
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	rmdir "${D}"/usr/$(get_libdir)/cryptsetup
-	insinto /$(get_libdir)/rcscripts/addons
-	newins "${FILESDIR}"/1.0.6-r2-dm-crypt-start.sh dm-crypt-start.sh || die
-	newins "${FILESDIR}"/1.0.5-dm-crypt-stop.sh dm-crypt-stop.sh || die
-	newconfd "${FILESDIR}"/1.0.6-dmcrypt.confd dmcrypt || die
-	newinitd "${FILESDIR}"/1.0.5-dmcrypt.rc dmcrypt || die
-}
-
-pkg_postinst() {
-	ewarn "This ebuild introduces a new set of scripts and configuration"
-	ewarn "than the last version. If you are currently using /etc/conf.d/cryptfs"
-	ewarn "then you *MUST* copy your old file to:"
-	ewarn "/etc/conf.d/dmcrypt"
-	ewarn "Or your encrypted partitions will *NOT* work."
-	elog "Please see the example for configuring a LUKS mountpoint"
-	elog "in /etc/conf.d/dmcrypt"
-	elog
-	elog "If you are using baselayout-2 then please do:"
-	elog "rc-update add dmcrypt boot"
-	elog "This version introduces a command line arguement 'key_timeout'."
-	elog "If you want the search for the removable key device to timeout"
-	elog "after 10 seconds add the following to your bootloader config:"
-	elog "key_timeout=10"
-	elog "A timeout of 0 will mean it will wait indefinitely."
-}
diff --git a/sys-fs/cryptsetup/cryptsetup-1.1.1.ebuild b/sys-fs/cryptsetup/cryptsetup-1.1.1.ebuild
deleted file mode 100644
index 7063c8ad4afe..000000000000
--- a/sys-fs/cryptsetup/cryptsetup-1.1.1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.1.1.ebuild,v 1.1 2010/05/24 18:34:15 robbat2 Exp $
-
-EAPI=2
-
-inherit linux-info eutils flag-o-matic multilib autotools
-
-MY_P=${P/_rc/-rc}
-DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
-HOMEPAGE="http://code.google.com/p/cryptsetup/"
-SRC_URI="http://cryptsetup.googlecode.com/files/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="dynamic nls selinux"
-
-S=${WORKDIR}/${MY_P}
-
-DEPEND=">=sys-fs/lvm2-2.02.64
-	>=dev-libs/libgcrypt-1.1.42
-	>=dev-libs/libgpg-error-1.0-r1
-	>=dev-libs/popt-1.7
-	>=sys-fs/udev-124
-	|| ( >=sys-libs/e2fsprogs-libs-1.41 <sys-fs/e2fsprogs-1.41 )
-	selinux? ( sys-libs/libselinux )
-	!sys-fs/cryptsetup-luks"
-
-pkg_setup() {
-	local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC"
-	local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
-	local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n"
-	local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n"
-	check_extra_config
-
-	if use dynamic ; then
-		ewarn "If you need cryptsetup for an initrd or initramfs then you"
-		ewarn "should NOT use the dynamic USE flag"
-		epause 5
-	fi
-}
-
-src_prepare() {
-	# Both merged upstream
-	#epatch "${FILESDIR}"/1.1.0_rc3-static-no-selinux.patch
-	#epatch "${FILESDIR}"/1.1.0-libudev.patch
-	eautoreconf
-	:
-}
-
-src_configure() {
-	econf \
-		--sbindir=/sbin \
-		--enable-shared \
-		$(use_enable !dynamic static) \
-		--libdir=/usr/$(get_libdir) \
-		$(use_enable nls) \
-		$(use_enable selinux) \
-		|| die
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	rmdir "${D}"/usr/$(get_libdir)/cryptsetup
-	insinto /$(get_libdir)/rcscripts/addons
-	newins "${FILESDIR}"/1.0.6-r2-dm-crypt-start.sh dm-crypt-start.sh || die
-	newins "${FILESDIR}"/1.0.5-dm-crypt-stop.sh dm-crypt-stop.sh || die
-	newconfd "${FILESDIR}"/1.0.6-dmcrypt.confd dmcrypt || die
-	newinitd "${FILESDIR}"/1.0.5-dmcrypt.rc dmcrypt || die
-	dodoc TODO ChangeLog # README NEWS # last ones are empty
-}
-
-pkg_postinst() {
-	ewarn "This ebuild introduces a new set of scripts and configuration"
-	ewarn "than the last version. If you are currently using /etc/conf.d/cryptfs"
-	ewarn "then you *MUST* copy your old file to:"
-	ewarn "/etc/conf.d/dmcrypt"
-	ewarn "Or your encrypted partitions will *NOT* work."
-	elog "Please see the example for configuring a LUKS mountpoint"
-	elog "in /etc/conf.d/dmcrypt"
-	elog
-	elog "If you are using baselayout-2 then please do:"
-	elog "rc-update add dmcrypt boot"
-	elog "This version introduces a command line arguement 'key_timeout'."
-	elog "If you want the search for the removable key device to timeout"
-	elog "after 10 seconds add the following to your bootloader config:"
-	elog "key_timeout=10"
-	elog "A timeout of 0 will mean it will wait indefinitely."
-}
diff --git a/sys-fs/cryptsetup/cryptsetup-1.1.1_rc1.ebuild b/sys-fs/cryptsetup/cryptsetup-1.1.1_rc1.ebuild
deleted file mode 100644
index ce208fc85c2a..000000000000
--- a/sys-fs/cryptsetup/cryptsetup-1.1.1_rc1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.1.1_rc1.ebuild,v 1.2 2010/05/01 21:59:18 robbat2 Exp $
-
-EAPI=2
-
-inherit linux-info eutils flag-o-matic multilib autotools
-
-MY_P=${P/_rc/-rc}
-DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
-HOMEPAGE="http://code.google.com/p/cryptsetup/"
-SRC_URI="http://cryptsetup.googlecode.com/files/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="dynamic nls selinux"
-
-S=${WORKDIR}/${MY_P}
-
-DEPEND=">=sys-fs/lvm2-2.02.64
-	>=dev-libs/libgcrypt-1.1.42
-	>=dev-libs/libgpg-error-1.0-r1
-	>=dev-libs/popt-1.7
-	>=sys-fs/udev-124
-	|| ( >=sys-libs/e2fsprogs-libs-1.41 <sys-fs/e2fsprogs-1.41 )
-	selinux? ( sys-libs/libselinux )
-	!sys-fs/cryptsetup-luks"
-
-pkg_setup() {
-	local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC"
-	local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
-	local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n"
-	local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n"
-	check_extra_config
-
-	if use dynamic ; then
-		ewarn "If you need cryptsetup for an initrd or initramfs then you"
-		ewarn "should NOT use the dynamic USE flag"
-		epause 5
-	fi
-}
-
-src_prepare() {
-	# Both merged upstream
-	#epatch "${FILESDIR}"/1.1.0_rc3-static-no-selinux.patch
-	#epatch "${FILESDIR}"/1.1.0-libudev.patch
-	eautoreconf
-	:
-}
-
-src_configure() {
-	econf \
-		--sbindir=/sbin \
-		--enable-shared \
-		$(use_enable !dynamic static) \
-		--libdir=/usr/$(get_libdir) \
-		$(use_enable nls) \
-		$(use_enable selinux) \
-		|| die
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	rmdir "${D}"/usr/$(get_libdir)/cryptsetup
-	insinto /$(get_libdir)/rcscripts/addons
-	newins "${FILESDIR}"/1.0.6-r2-dm-crypt-start.sh dm-crypt-start.sh || die
-	newins "${FILESDIR}"/1.0.5-dm-crypt-stop.sh dm-crypt-stop.sh || die
-	newconfd "${FILESDIR}"/1.0.6-dmcrypt.confd dmcrypt || die
-	newinitd "${FILESDIR}"/1.0.5-dmcrypt.rc dmcrypt || die
-}
-
-pkg_postinst() {
-	ewarn "This ebuild introduces a new set of scripts and configuration"
-	ewarn "than the last version. If you are currently using /etc/conf.d/cryptfs"
-	ewarn "then you *MUST* copy your old file to:"
-	ewarn "/etc/conf.d/dmcrypt"
-	ewarn "Or your encrypted partitions will *NOT* work."
-	elog "Please see the example for configuring a LUKS mountpoint"
-	elog "in /etc/conf.d/dmcrypt"
-	elog
-	elog "If you are using baselayout-2 then please do:"
-	elog "rc-update add dmcrypt boot"
-	elog "This version introduces a command line arguement 'key_timeout'."
-	elog "If you want the search for the removable key device to timeout"
-	elog "after 10 seconds add the following to your bootloader config:"
-	elog "key_timeout=10"
-	elog "A timeout of 0 will mean it will wait indefinitely."
-}
diff --git a/sys-fs/cryptsetup/cryptsetup-1.1.1_rc2.ebuild b/sys-fs/cryptsetup/cryptsetup-1.1.1_rc2.ebuild
deleted file mode 100644
index 63272abcaa7b..000000000000
--- a/sys-fs/cryptsetup/cryptsetup-1.1.1_rc2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.1.1_rc2.ebuild,v 1.1 2010/05/14 08:50:14 robbat2 Exp $
-
-EAPI=2
-
-inherit linux-info eutils flag-o-matic multilib autotools
-
-MY_P=${P/_rc/-rc}
-DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
-HOMEPAGE="http://code.google.com/p/cryptsetup/"
-SRC_URI="http://cryptsetup.googlecode.com/files/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="dynamic nls selinux"
-
-S=${WORKDIR}/${MY_P}
-
-DEPEND=">=sys-fs/lvm2-2.02.64
-	>=dev-libs/libgcrypt-1.1.42
-	>=dev-libs/libgpg-error-1.0-r1
-	>=dev-libs/popt-1.7
-	>=sys-fs/udev-124
-	|| ( >=sys-libs/e2fsprogs-libs-1.41 <sys-fs/e2fsprogs-1.41 )
-	selinux? ( sys-libs/libselinux )
-	!sys-fs/cryptsetup-luks"
-
-pkg_setup() {
-	local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC"
-	local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
-	local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n"
-	local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n"
-	check_extra_config
-
-	if use dynamic ; then
-		ewarn "If you need cryptsetup for an initrd or initramfs then you"
-		ewarn "should NOT use the dynamic USE flag"
-		epause 5
-	fi
-}
-
-src_prepare() {
-	# Both merged upstream
-	#epatch "${FILESDIR}"/1.1.0_rc3-static-no-selinux.patch
-	#epatch "${FILESDIR}"/1.1.0-libudev.patch
-	eautoreconf
-	:
-}
-
-src_configure() {
-	econf \
-		--sbindir=/sbin \
-		--enable-shared \
-		$(use_enable !dynamic static) \
-		--libdir=/usr/$(get_libdir) \
-		$(use_enable nls) \
-		$(use_enable selinux) \
-		|| die
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	rmdir "${D}"/usr/$(get_libdir)/cryptsetup
-	insinto /$(get_libdir)/rcscripts/addons
-	newins "${FILESDIR}"/1.0.6-r2-dm-crypt-start.sh dm-crypt-start.sh || die
-	newins "${FILESDIR}"/1.0.5-dm-crypt-stop.sh dm-crypt-stop.sh || die
-	newconfd "${FILESDIR}"/1.0.6-dmcrypt.confd dmcrypt || die
-	newinitd "${FILESDIR}"/1.0.5-dmcrypt.rc dmcrypt || die
-	dodoc TODO ChangeLog # README NEWS # last ones are empty
-}
-
-pkg_postinst() {
-	ewarn "This ebuild introduces a new set of scripts and configuration"
-	ewarn "than the last version. If you are currently using /etc/conf.d/cryptfs"
-	ewarn "then you *MUST* copy your old file to:"
-	ewarn "/etc/conf.d/dmcrypt"
-	ewarn "Or your encrypted partitions will *NOT* work."
-	elog "Please see the example for configuring a LUKS mountpoint"
-	elog "in /etc/conf.d/dmcrypt"
-	elog
-	elog "If you are using baselayout-2 then please do:"
-	elog "rc-update add dmcrypt boot"
-	elog "This version introduces a command line arguement 'key_timeout'."
-	elog "If you want the search for the removable key device to timeout"
-	elog "after 10 seconds add the following to your bootloader config:"
-	elog "key_timeout=10"
-	elog "A timeout of 0 will mean it will wait indefinitely."
-}