old

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

14 files changed, 11 insertions, 1615 deletions

diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog
index 34fd792a0911..e463ce6d12ab 100644
--- a/sys-fs/cryptsetup/ChangeLog
+++ b/sys-fs/cryptsetup/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-fs/cryptsetup
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.174 2014/08/26 14:36:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.175 2014/08/26 14:43:47 ssuominen Exp $
+
+  26 Aug 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +files/dmcrypt-1.0.6.confd, -cryptsetup-1.0.6-r2.ebuild,
+  -cryptsetup-1.1.3-r3.ebuild, -cryptsetup-1.2.0-r1.ebuild,
+  -cryptsetup-1.4.3.ebuild, -cryptsetup-1.5.1.ebuild,
+  -files/1.0.5-dm-crypt-stop.sh, -files/1.0.5-dmcrypt.rc,
+  -files/1.0.6-dmcrypt.confd, -files/1.0.6-r2-dm-crypt-start.sh,
+  -files/1.1.3-dm-crypt-start.sh, -files/1.1.3-dm-crypt-stop.sh,
+  -files/cryptsetup-1.0.6-udevsettle.patch, -files/dmcrypt.rc:
+  old
 
   26 Aug 2014; Samuli Suominen <ssuominen@gentoo.org> cryptsetup-1.6.2.ebuild,
   cryptsetup-1.6.6.ebuild:
diff --git a/sys-fs/cryptsetup/cryptsetup-1.0.6-r2.ebuild b/sys-fs/cryptsetup/cryptsetup-1.0.6-r2.ebuild
deleted file mode 100644
index 8ca679b0640a..000000000000
--- a/sys-fs/cryptsetup/cryptsetup-1.0.6-r2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.0.6-r2.ebuild,v 1.18 2014/07/25 19:59:10 ssuominen Exp $
-
-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://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"
-
-RDEPEND=">=sys-fs/lvm2-2.02.45
-	>=dev-libs/libgcrypt-1.1.42
-	>=dev-libs/libgpg-error-1.0-r1
-	>=dev-libs/popt-1.7
-	virtual/libudev
-	|| ( >=sys-libs/e2fsprogs-libs-1.41 <sys-fs/e2fsprogs-1.41 )
-	selinux? ( sys-libs/libselinux )
-	!sys-fs/cryptsetup-luks"
-DEPEND="${RDEPEND}"
-
-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_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# fix for bug #236481, use udevadm instead of udevsettle
-	epatch "${FILESDIR}"/${PN}-1.0.6-udevsettle.patch
-}
-
-src_compile() {
-	use selinux || export ac_cv_lib_selinux_is_selinux_enabled=no
-	econf \
-		--sbindir=/sbin \
-		$(use_enable !dynamic static) \
-		--libdir=/usr/$(get_libdir) \
-		$(use_enable nls) \
-		|| die
-	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.3-r3.ebuild b/sys-fs/cryptsetup/cryptsetup-1.1.3-r3.ebuild
deleted file mode 100644
index e71df767a977..000000000000
--- a/sys-fs/cryptsetup/cryptsetup-1.1.3-r3.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.1.3-r3.ebuild,v 1.10 2014/07/25 19:59:09 ssuominen Exp $
-
-EAPI="2"
-
-inherit linux-info eutils multilib libtool
-
-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}
-
-RDEPEND=">=sys-fs/lvm2-2.02.64
-	>=dev-libs/libgcrypt-1.1.42:0
-	>=dev-libs/libgpg-error-1.0-r1
-	>=dev-libs/popt-1.7
-	virtual/libudev
-	|| ( >=sys-libs/e2fsprogs-libs-1.41 <sys-fs/e2fsprogs-1.41 )
-	selinux? ( sys-libs/libselinux )
-	!sys-fs/cryptsetup-luks
-	>=sys-apps/util-linux-2.17.2"
-DEPEND="${RDEPEND}
-	!dynamic? (
-		|| ( >=dev-libs/libgpg-error-1.10[static-libs] <dev-libs/libgpg-error-1.10 )
-		|| ( >=dev-libs/popt-1.16-r1[static-libs] <dev-libs/popt-1.16-r1 )
-		dev-libs/libgcrypt:0[static-libs]
-		|| ( >=sys-apps/util-linux-2.20[static-libs] <sys-apps/util-linux-2.20 )
-	)"
-
-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() {
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--sbindir=/sbin \
-		--enable-shared \
-		$(use_enable !dynamic static) \
-		--libdir=/usr/$(get_libdir) \
-		$(use_enable nls) \
-		$(use_enable selinux)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc TODO ChangeLog # README NEWS # last ones are empty
-
-	insinto /$(get_libdir)/rcscripts/addons
-	newins "${FILESDIR}"/1.1.3-dm-crypt-start.sh dm-crypt-start.sh || die
-	newins "${FILESDIR}"/1.1.3-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."
-	elog
-	elog "Users using cryptsetup-1.0.x (dm-crypt plain) volumes must use"
-	elog "a compatibility mode when using cryptsetup-1.1.x. This can be"
-	elog "done by specifying the cipher (-c), key size (-s) and hash (-h)."
-	elog "For more info, see http://code.google.com/p/cryptsetup/wiki/FrequentlyAskedQuestions#6._Issues_with_Specific_Versions_of_cryptsetup"
-
-}
diff --git a/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild
deleted file mode 100644
index 61a42b754798..000000000000
--- a/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild,v 1.15 2014/07/25 19:59:10 ssuominen Exp $
-
-EAPI="2"
-
-inherit linux-info eutils multilib libtool
-
-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="nls selinux +static"
-
-S=${WORKDIR}/${MY_P}
-
-RDEPEND="
-	!static? (
-		>=dev-libs/libgcrypt-1.1.42:0
-		dev-libs/libgpg-error
-		>=dev-libs/popt-1.7
-		>=sys-apps/util-linux-2.17.2
-		>=sys-fs/lvm2-2.02.64
-	)
-	virtual/libudev
-	>=sys-libs/e2fsprogs-libs-1.41
-	selinux? ( sys-libs/libselinux )
-	!sys-fs/cryptsetup-luks"
-DEPEND="${RDEPEND}
-	static? (
-		>=dev-libs/libgpg-error-1.10[static-libs]
-		>=dev-libs/popt-1.16-r1[static-libs]
-		|| ( >=sys-apps/util-linux-2.20[static-libs] <sys-apps/util-linux-2.20 )
-		dev-libs/libgcrypt:0[static-libs]
-		|| ( >=sys-fs/lvm2-2.02.88[static-libs] <sys-fs/lvm2-2.02.88 )
-		virtual/libudev[static-libs]
-	)"
-
-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
-}
-
-src_prepare() {
-	sed -i '/enable_static_cryptsetup=yes/d' configure #350463
-	sed -i '/^LOOPDEV=/s:=.*:=`losetup -f` || exit 0:' tests/{compat,mode}-test
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--sbindir=/sbin \
-		--enable-shared \
-		--libdir=/usr/$(get_libdir) \
-		$(use_enable static static-cryptsetup) \
-		$(use_enable nls) \
-		$(use_enable selinux)
-}
-
-src_test() {
-	if [[ ! -e /dev/mapper/control ]] ; then
-		ewarn "No /dev/mapper/control found -- skipping tests"
-		return 0
-	fi
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	use static && { mv "${D}"/sbin/cryptsetup{.static,} || die ; }
-	dodoc TODO ChangeLog README NEWS
-
-	insinto /$(get_libdir)/rcscripts/addons
-	newins "${FILESDIR}"/1.1.3-dm-crypt-start.sh dm-crypt-start.sh || die
-	newins "${FILESDIR}"/1.1.3-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."
-	elog
-	elog "Users using cryptsetup-1.0.x (dm-crypt plain) volumes must use"
-	elog "a compatibility mode when using cryptsetup-1.1.x. This can be"
-	elog "done by specifying the cipher (-c), key size (-s) and hash (-h)."
-	elog "For more info, see http://code.google.com/p/cryptsetup/wiki/FrequentlyAskedQuestions#6._Issues_with_Specific_Versions_of_cryptsetup"
-}
diff --git a/sys-fs/cryptsetup/cryptsetup-1.4.3.ebuild b/sys-fs/cryptsetup/cryptsetup-1.4.3.ebuild
deleted file mode 100644
index 3745b4758660..000000000000
--- a/sys-fs/cryptsetup/cryptsetup-1.4.3.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.4.3.ebuild,v 1.11 2014/07/25 19:59:09 ssuominen Exp $
-
-EAPI="4"
-
-inherit linux-info libtool
-
-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="nls selinux static static-libs udev"
-
-S=${WORKDIR}/${MY_P}
-
-LIB_DEPEND="dev-libs/libgpg-error[static-libs(+)]
-	>=dev-libs/popt-1.7[static-libs(+)]
-	>=sys-apps/util-linux-2.17.2[static-libs(+)]
-	>=dev-libs/libgcrypt-1.1.42:0[static-libs(+)]
-	>=sys-fs/lvm2-2.02.64[static-libs(+)]
-	>=sys-libs/e2fsprogs-libs-1.41[static-libs(+)]
-	udev? ( virtual/libudev[static-libs(+)] )"
-# We have to always depend on ${LIB_DEPEND} rather than put behind
-# static? () because we provide a shared library which links against
-# these other packages. #414665
-RDEPEND="static-libs? ( ${LIB_DEPEND} )
-	${LIB_DEPEND//\[static-libs(+)]}
-	!<sys-apps/baselayout-2
-	!sys-fs/cryptsetup-luks
-	selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-
-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
-}
-
-src_prepare() {
-	sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--sbindir=/sbin \
-		--enable-shared \
-		$(use_enable static static-cryptsetup) \
-		$(use_enable static-libs static) \
-		$(use_enable nls) \
-		$(use_enable selinux) \
-		$(use_enable udev)
-}
-
-src_test() {
-	if [[ ! -e /dev/mapper/control ]] ; then
-		ewarn "No /dev/mapper/control found -- skipping tests"
-		return 0
-	fi
-	local p
-	for p in /dev/mapper /dev/loop* ; do
-		addwrite ${p}
-	done
-	default
-}
-
-src_install() {
-	default
-	use static && { mv "${ED}"/sbin/cryptsetup{.static,} || die ; }
-	use static-libs || find "${ED}"/usr -name '*.la' -delete
-
-	newconfd "${FILESDIR}"/1.0.6-dmcrypt.confd dmcrypt
-	newinitd "${FILESDIR}"/dmcrypt.rc dmcrypt
-}
-
-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."
-	elog
-	elog "Users using cryptsetup-1.0.x (dm-crypt plain) volumes must use"
-	elog "a compatibility mode when using cryptsetup-1.1.x. This can be"
-	elog "done by specifying the cipher (-c), key size (-s) and hash (-h)."
-	elog "For more info, see http://code.google.com/p/cryptsetup/wiki/FrequentlyAskedQuestions#6._Issues_with_Specific_Versions_of_cryptsetup"
-}
diff --git a/sys-fs/cryptsetup/cryptsetup-1.5.1.ebuild b/sys-fs/cryptsetup/cryptsetup-1.5.1.ebuild
deleted file mode 100644
index 6753b566fab1..000000000000
--- a/sys-fs/cryptsetup/cryptsetup-1.5.1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.5.1.ebuild,v 1.5 2014/07/25 19:59:10 ssuominen Exp $
-
-EAPI="4"
-
-inherit python linux-info libtool
-
-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="nls python reencrypt selinux static static-libs udev urandom"
-
-S=${WORKDIR}/${MY_P}
-
-LIB_DEPEND="dev-libs/libgpg-error[static-libs(+)]
-	dev-libs/popt[static-libs(+)]
-	sys-apps/util-linux[static-libs(+)]
-	dev-libs/libgcrypt:0[static-libs(+)]
-	sys-fs/lvm2[static-libs(+)]
-	sys-libs/e2fsprogs-libs[static-libs(+)]
-	udev? ( virtual/libudev[static-libs(+)] )"
-# We have to always depend on ${LIB_DEPEND} rather than put behind
-# static? () because we provide a shared library which links against
-# these other packages. #414665
-RDEPEND="static-libs? ( ${LIB_DEPEND} )
-	${LIB_DEPEND//\[static-libs(+)]}
-	selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-
-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 python ; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--sbindir=/sbin \
-		--enable-shared \
-		$(use_enable static static-cryptsetup) \
-		$(use_enable static-libs static) \
-		$(use_enable nls) \
-		$(use_enable python) \
-		$(use_enable reencrypt cryptsetup-reencrypt) \
-		$(use_enable selinux) \
-		$(use_enable udev) \
-		$(use_enable !urandom dev-random)
-}
-
-src_test() {
-	if [[ ! -e /dev/mapper/control ]] ; then
-		ewarn "No /dev/mapper/control found -- skipping tests"
-		return 0
-	fi
-	local p
-	for p in /dev/mapper /dev/loop* ; do
-		addwrite ${p}
-	done
-	default
-}
-
-src_install() {
-	default
-	if use static ; then
-		mv "${ED}"/sbin/cryptsetup{.static,} || die
-		mv "${ED}"/sbin/veritysetup{.static,} || die
-		use reencrypt && { mv "${ED}"/sbin/cryptsetup-reencrypt{.static,} || die ; }
-	fi
-	use static-libs || find "${ED}"/usr -name '*.la' -delete
-
-	newconfd "${FILESDIR}"/1.0.6-dmcrypt.confd dmcrypt
-	newinitd "${FILESDIR}"/1.5.1-dmcrypt.rc dmcrypt
-}
-
-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."
-	elog
-	elog "Users using cryptsetup-1.0.x (dm-crypt plain) volumes must use"
-	elog "a compatibility mode when using cryptsetup-1.1.x. This can be"
-	elog "done by specifying the cipher (-c), key size (-s) and hash (-h)."
-	elog "For more info, see http://code.google.com/p/cryptsetup/wiki/FrequentlyAskedQuestions#6._Issues_with_Specific_Versions_of_cryptsetup"
-}
diff --git a/sys-fs/cryptsetup/files/1.0.5-dm-crypt-stop.sh b/sys-fs/cryptsetup/files/1.0.5-dm-crypt-stop.sh
deleted file mode 100644
index 299e43bb9b2f..000000000000
--- a/sys-fs/cryptsetup/files/1.0.5-dm-crypt-stop.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-# /lib/rcscripts/addons/dm-crypt-stop.sh
-
-# Try to remove any dm-crypt mappings
-csetup=/sbin/cryptsetup
-if [ -f /etc/conf.d/dmcrypt ] && [ -x "$csetup" ]
-then
-	einfo "Removing dm-crypt mappings"
-
-	/bin/egrep "^(target|swap)" /etc/conf.d/dmcrypt | \
-	while read targetline
-	do
-		target=
-		swap=
-
-		eval ${targetline}
-
-		[ -n "${swap}" ] && target=${swap}
-		[ -z "${target}" ] && ewarn "Invalid line in /etc/conf.d/dmcrypt: ${targetline}"
-
-		ebegin "Removing dm-crypt mapping for: ${target}"
-		${csetup} remove ${target}
-		eend $? "Failed to remove dm-crypt mapping for: ${target}"
-	done
-
-	if [[ -n $(/bin/egrep -e "^(source=)./dev/loop*" /etc/conf.d/dmcrypt) ]] ; then
-		einfo "Taking down any dm-crypt loop devices"
-		/bin/egrep -e "^(source)" /etc/conf.d/dmcrypt | while read sourceline
-		do
-			source=
-			eval ${sourceline}
-			if [[ -n $(echo ${source} | grep /dev/loop) ]] ; then
-				ebegin "   Taking down ${source}"
-				/sbin/losetup -d ${source}
-				eend $? "  Failed to remove loop"
-			fi
-		done
-	fi
-fi
-
-# vim:ts=4
diff --git a/sys-fs/cryptsetup/files/1.0.5-dmcrypt.rc b/sys-fs/cryptsetup/files/1.0.5-dmcrypt.rc
deleted file mode 100644
index dd7585b7f65e..000000000000
--- a/sys-fs/cryptsetup/files/1.0.5-dmcrypt.rc
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/files/1.0.5-dmcrypt.rc,v 1.4 2011/01/18 20:05:18 vapier Exp $
-
-depend() {
-	before checkfs fsck
-}
-
-start() {
-	if [ ! -e /lib/librc.so ]; then
-		eerror "The ${myservice} init script is written for baselayout-2"
-		eerror "Please do not use it with baselayout-1"
-		return 1
-	fi
-
-	. /lib/rcscripts/addons/dm-crypt-start.sh
-}
-
-stop() {
-	if [ ! -e /lib/librc.so ]; then
-		return 0
-	fi
-
-	. /lib/rcscripts/addons/dm-crypt-stop.sh
-}
diff --git a/sys-fs/cryptsetup/files/1.0.6-r2-dm-crypt-start.sh b/sys-fs/cryptsetup/files/1.0.6-r2-dm-crypt-start.sh
deleted file mode 100644
index 44d2c4563b18..000000000000
--- a/sys-fs/cryptsetup/files/1.0.6-r2-dm-crypt-start.sh
+++ /dev/null
@@ -1,294 +0,0 @@
-# /lib/rcscripts/addons/dm-crypt-start.sh
-
-# For backwards compatability with baselayout < 1.13.0
-dm_crypt_execute_checkfs() {
-	dm_crypt_execute_dmcrypt
-}
-
-dm_crypt_execute_volumes() {
-	dm_crypt_execute_dmcrypt
-}
-
-# Setup mappings for an individual target/swap
-# Note: This relies on variables localized in the main body below.
-dm_crypt_execute_dmcrypt() {
-	local dev ret mode foo
-	# some colors
-	local red='\x1b[31;01m' green='\x1b[32;01m' off='\x1b[0;0m'
-
-	if [ -n "$target" ]; then
-		# let user set options, otherwise leave empty
-		: ${options:=' '}
-	elif [ -n "$swap" ]; then
-		einfo "Checking swap is not LUKS"
-		cryptsetup isLuks ${source} 2>/dev/null
-		foo="$?"
-		if [ "${foo}" -eq 0 ]; then
-		ewarn "The swap you have defined is a LUKS partition. Aborting crypt-swap setup."
-		return
-		fi
-		target=${swap}
-		# swap contents do not need to be preserved between boots, luks not required.
-		# suspend2 users should have initramfs's init handling their swap partition either way.
-		: ${options:='-c aes -h sha1 -d /dev/urandom'}
-		: ${pre_mount:='mkswap ${dev}'}
-	else
-		return
-	fi
-	if [ -z "$source" ] && [ ! -e "$source" ]; then
-		ewarn "source \"${source}\" for ${target} missing, skipping..."
-		return
-	fi
-
-	if [[ -n ${loop_file} ]] ; then
-		dev="/dev/mapper/${target}"
-		ebegin "  Setting up loop device ${source}"
-		/sbin/losetup ${source} ${loop_file}
-	fi
-
-	# cryptsetup:
-	# luksOpen <device> <name>      # <device> is $source
-	# create   <name>   <device>    # <name>   is $target
-	local arg1="create" arg2="$target" arg3="$source" luks=0
-
-	cryptsetup isLuks ${source} 2>/dev/null && { arg1="luksOpen"; arg2="$source"; arg3="$target"; luks=1; }
-
-	if /sbin/cryptsetup status ${target} | egrep -q '\<active:' ; then
-		einfo "dm-crypt mapping ${target} is already configured"
-		return
-	fi
-	splash svc_input_begin ${SVCNAME} >/dev/null 2>&1
-
-	# Handle keys
-	if [ -n "$key" ]; then
-		read_abort() {
-			local ans
-			local prompt=" ${green}*${off}  $1? (${red}yes${off}/${green}No${off}) "
-			shift
-			echo -n -e "${prompt}"
-			if ! read -n 1 $* ans ; then
-				local back=${prompt//?/\\b}
-				echo -n -e "${back}"
-			else
-				echo
-			fi
-			case $ans in
-				[yY]|[yY][eE][sS]) return 0;;
-				*) return 1;;
-			esac
-		}
-
-		# Notes: sed not used to avoid case where /usr partition is encrypted.
-		mode=${key/*:/} && ( [ "$mode" == "$key" ] || [ -z "$mode" ] ) && mode=reg
-		key=${key/:*/}
-		case "$mode" in
-		gpg|reg)
-			# handle key on removable device
-			if [ -n "$remdev" ]; then
-				# temp directory to mount removable device
-				local mntrem="${RC_SVCDIR}/dm-crypt-remdev.$$"
-				if [ ! -d "${mntrem}" ] ; then
-					if ! mkdir -p "${mntrem}" ; then
-						ewarn "${source} will not be decrypted ..."
-						einfo "Reason: Unable to create temporary mount point '${mntrem}'"
-						return
-					fi
-				fi
-				i=0
-				einfo "Please insert removable device for ${target}"
-				while [ ${i} -lt ${dmcrypt_max_timeout:-120} ] ; do
-					foo=""
-					if mount -n -o ro "${remdev}" "${mntrem}" 2>/dev/null >/dev/null ; then
-						# keyfile exists?
-						if [ ! -e "${mntrem}${key}" ]; then
-							umount -n "${mntrem}"
-							rmdir "${mntrem}"
-							einfo "Cannot find ${key} on removable media."
-							read_abort "Abort" ${read_timeout:--t 1} && return
-						else
-							key="${mntrem}${key}"
-							break
-						fi
-					else
-						[ -e "${remdev}" ] \
-							&& foo="mount failed" \
-							|| foo="mount source not found"
-					fi
-					((++i))
-					read_abort "Stop waiting after $i attempts (${foo})" -t 1 && return
-				done
-			else    # keyfile ! on removable device
-				if [ ! -e "$key" ]; then
-					ewarn "${source} will not be decrypted ..."
-					einfo "Reason: keyfile ${key} does not exist."
-					return
-				fi
-			fi
-			;;
-		*)
-			ewarn "${source} will not be decrypted ..."
-			einfo "Reason: mode ${mode} is invalid."
-			return
-			;;
-		esac
-	else
-		mode=none
-	fi
-	ebegin "dm-crypt map ${target}"
-	einfo "cryptsetup will be called with : ${options} ${arg1} ${arg2} ${arg3}"
-	if [ "$mode" == "gpg" ]; then
-		: ${gpg_options:='-q -d'}
-		# gpg available ?
-		if type -p gpg >/dev/null ; then
-			for (( i = 0 ; i < 3 ; i++ ))
-			do
-				# paranoid, don't store key in a variable, pipe it so it stays very little in ram unprotected.
-				# save stdin stdout stderr "values"
-				gpg ${gpg_options} ${key} 2>/dev/null | cryptsetup ${options} ${arg1} ${arg2} ${arg3}
-				ret="$?"
-				[ "$ret" -eq 0 ] && break
-			done
-			eend "${ret}" "failure running cryptsetup"
-		else
-			ewarn "${source} will not be decrypted ..."
-			einfo "Reason: cannot find gpg application."
-			einfo "You have to install app-crypt/gnupg first."
-			einfo "If you have /usr on its own partition, try copying gpg to /bin ."
-		fi
-	else
-		if [ "$mode" == "reg" ]; then
-			cryptsetup ${options} -d ${key} ${arg1} ${arg2} ${arg3}
-			ret="$?"
-			eend "${ret}" "failure running cryptsetup"
-		else
-			cryptsetup ${options} ${arg1} ${arg2} ${arg3}
-			ret="$?"
-			eend "${ret}" "failure running cryptsetup"
-		fi
-	fi
-	if [ -d "$mntrem" ]; then
-		umount -n ${mntrem} 2>/dev/null >/dev/null
-		rmdir ${mntrem} 2>/dev/null >/dev/null
-	fi
-	splash svc_input_end ${SVCNAME} >/dev/null 2>&1
-
-	if [[ ${ret} != 0 ]] ; then
-		cryptfs_status=1
-	else
-		if [[ -n ${pre_mount} ]] ; then
-			dev="/dev/mapper/${target}"
-			ebegin "  Running pre_mount commands for ${target}"
-			eval "${pre_mount}" > /dev/null
-			ewend $? || cryptfs_status=1
-		fi
-	fi
-}
-
-# Run any post_mount commands for an individual mount
-#
-# Note: This relies on variables localized in the main body below.
-dm_crypt_execute_localmount() {
-	local mount_point
-
-	[ -z "$target" ] && [ -z "$post_mount" ] && return
-
-	if ! /sbin/cryptsetup status ${target} | egrep -q '\<active:' ; then
-		ewarn "Skipping unmapped target ${target}"
-		cryptfs_status=1
-		return
-	fi
-
-	mount_point=$(grep "/dev/mapper/${target}" /proc/mounts | cut -d' ' -f2)
-	if [[ -z ${mount_point} ]] ; then
-		ewarn "Failed to find mount point for ${target}, skipping"
-		cryptfs_status=1
-	fi
-
-	if [[ -n ${post_mount} ]] ; then
-		ebegin "Running post_mount commands for target ${target}"
-		eval "${post_mount}" >/dev/null
-		eend $? || cryptfs_status=1
-	fi
-}
-
-# Determine string lengths
-strlen() {
-	if [ -z "$1" ]
-		then
-			echo "usage: strlen <variable_name>"
-			die
-		fi
-	eval echo "\${#${1}}"
-}
-
-# Lookup optional bootparams
-parse_opt() {
-	case "$1" in
-		*\=*)
-			local key_name="`echo "$1" | cut -f1 -d=`"
-			local key_len=`strlen key_name`
-			local value_start=$((key_len+2))
-			echo "$1" | cut -c ${value_start}-
-		;;
-	esac
-}
-
-local cryptfs_status=0
-local gpg_options key loop_file target targetline options pre_mount post_mount source swap remdev
-
-CMDLINE="`cat /proc/cmdline`"
-for x in ${CMDLINE}
-do
-	case "${x}" in
-		key_timeout\=*)
-			KEY_TIMEOUT=`parse_opt "${x}"`
-			if [ ${KEY_TIMEOUT} -gt 0 ]; then
-				read_timeout="-t ${KEY_TIMEOUT}"
-			fi
-		;;
-	esac
-done
-
-if [[ -f /etc/conf.d/dmcrypt ]] && [[ -x /sbin/cryptsetup ]] ; then
-	ebegin "Setting up dm-crypt mappings"
-
-	# Fix for baselayout-1.12.10 (bug 174256)
-	[ -z ${SVCNAME} ] && SVCNAME="${myservice}"
-
-	while read -u 3 targetline ; do
-		# skip comments and blank lines
-		[[ ${targetline}\# == \#* ]] && continue
-
-		# check for the start of a new target/swap
-		case ${targetline} in
-			target=*|swap=*)
-				# If we have a target queued up, then execute it
-				dm_crypt_execute_${SVCNAME}
-
-				# Prepare for the next target/swap by resetting variables
-				unset gpg_options key loop_file target options pre_mount post_mount source swap remdev
-				;;
-
-			gpg_options=*|remdev=*|key=*|loop_file=*|options=*|pre_mount=*|post_mount=*|source=*)
-				if [[ -z ${target} && -z ${swap} ]] ; then
-					ewarn "Ignoring setting outside target/swap section: ${targetline}"
-					continue
-				fi
-				;;
-
-			*)
-				ewarn "Skipping invalid line in /etc/conf.d/dmcrypt: ${targetline}"
-				;;
-		esac
-
-		# Queue this setting for the next call to dm_crypt_execute_${SVCNAME}
-		eval "${targetline}"
-	done 3< /etc/conf.d/dmcrypt
-
-	# If we have a target queued up, then execute it
-	dm_crypt_execute_${SVCNAME}
-
-	ewend ${cryptfs_status} "Failed to setup dm-crypt devices"
-fi
-
-# vim:ts=4
diff --git a/sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh b/sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh
deleted file mode 100644
index e56dbc97815d..000000000000
--- a/sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh
+++ /dev/null
@@ -1,309 +0,0 @@
-# /lib/rcscripts/addons/dm-crypt-start.sh
-
-# For backwards compatibility with baselayout < 1.13.0 #174256
-: ${SVCNAME:=${myservice}}
-
-# We might be hooked into init.d scripts (ala baselayout-1), or we might
-# be a standalone dmcrypt script.  We support multiple dmcrypt instances,
-# but they must start with "dmcrypt." to be detected that way.  It keeps
-# our lives much simpler with this multiplexed arrangement.
-execute_hook="dm_crypt_execute_dmcrypt"
-conf_file="dmcrypt"
-case ${SVCNAME} in
-	localmount) execute_hook="dm_crypt_execute_localmount" ;;
-	dmcrypt.*)  conf_file="${SVCNAME}" ;;
-esac
-conf_file="/etc/conf.d/${conf_file}"
-
-# Setup mappings for an individual target/swap
-# Note: This relies on variables localized in the main body below.
-dm_crypt_execute_dmcrypt() {
-	local dev ret mode foo
-	# some colors
-	local red='\x1b[31;01m' green='\x1b[32;01m' off='\x1b[0;0m'
-
-	if [ -n "$target" ]; then
-		# let user set options, otherwise leave empty
-		: ${options:=' '}
-	elif [ -n "$swap" ]; then
-		einfo "Checking swap is not LUKS"
-		cryptsetup isLuks ${source} 2>/dev/null
-		foo="$?"
-		if [ "${foo}" -eq 0 ]; then
-		ewarn "The swap you have defined is a LUKS partition. Aborting crypt-swap setup."
-		return
-		fi
-		target=${swap}
-		# swap contents do not need to be preserved between boots, luks not required.
-		# suspend2 users should have initramfs's init handling their swap partition either way.
-		: ${options:='-c aes -h sha1 -d /dev/urandom'}
-		: ${pre_mount:='mkswap ${dev}'}
-	else
-		return
-	fi
-	if [ -z "$source" ] && [ ! -e "$source" ]; then
-		ewarn "source \"${source}\" for ${target} missing, skipping..."
-		return
-	fi
-
-	if [[ -n ${loop_file} ]] ; then
-		dev="/dev/mapper/${target}"
-		ebegin "  Setting up loop device ${source}"
-		/sbin/losetup ${source} ${loop_file}
-	fi
-
-	# cryptsetup:
-	# luksOpen <device> <name>      # <device> is $source
-	# create   <name>   <device>    # <name>   is $target
-	local arg1="create" arg2="$target" arg3="$source" luks=0
-
-	cryptsetup isLuks ${source} 2>/dev/null && { arg1="luksOpen"; arg2="$source"; arg3="$target"; luks=1; }
-
-	# Older versions reported:
-	#	${target} is active:
-	# Newer versions report:
-	#	${target} is active[ and is in use.]
-	if cryptsetup status ${target} | egrep -q ' is active' ; then
-		einfo "dm-crypt mapping ${target} is already configured"
-		return
-	fi
-	splash svc_input_begin ${SVCNAME} >/dev/null 2>&1
-
-	# Handle keys
-	if [ -n "$key" ]; then
-		read_abort() {
-			local ans
-			local prompt=" ${green}*${off}  $1? (${red}yes${off}/${green}No${off}) "
-			shift
-			echo -n -e "${prompt}"
-			if ! read -n 1 $* ans ; then
-				local back=${prompt//?/\\b}
-				echo -n -e "${back}"
-			else
-				echo
-			fi
-			case $ans in
-				[yY]|[yY][eE][sS]) return 0;;
-				*) return 1;;
-			esac
-		}
-
-		# Notes: sed not used to avoid case where /usr partition is encrypted.
-		mode=${key/*:/} && ( [ "$mode" == "$key" ] || [ -z "$mode" ] ) && mode=reg
-		key=${key/:*/}
-		case "$mode" in
-		gpg|reg)
-			# handle key on removable device
-			if [ -n "$remdev" ]; then
-				# temp directory to mount removable device
-				local mntrem="${RC_SVCDIR}/dm-crypt-remdev.$$"
-				if [ ! -d "${mntrem}" ] ; then
-					if ! mkdir -p "${mntrem}" ; then
-						ewarn "${source} will not be decrypted ..."
-						einfo "Reason: Unable to create temporary mount point '${mntrem}'"
-						return
-					fi
-				fi
-				i=0
-				einfo "Please insert removable device for ${target}"
-				while [ ${i} -lt ${dmcrypt_max_timeout:-120} ] ; do
-					foo=""
-					if mount -n -o ro "${remdev}" "${mntrem}" 2>/dev/null >/dev/null ; then
-						# keyfile exists?
-						if [ ! -e "${mntrem}${key}" ]; then
-							umount -n "${mntrem}"
-							rmdir "${mntrem}"
-							einfo "Cannot find ${key} on removable media."
-							read_abort "Abort" ${read_timeout:--t 1} && return
-						else
-							key="${mntrem}${key}"
-							break
-						fi
-					else
-						[ -e "${remdev}" ] \
-							&& foo="mount failed" \
-							|| foo="mount source not found"
-					fi
-					((++i))
-					read_abort "Stop waiting after $i attempts (${foo})" -t 1 && return
-				done
-			else    # keyfile ! on removable device
-				if [ ! -e "$key" ]; then
-					ewarn "${source} will not be decrypted ..."
-					einfo "Reason: keyfile ${key} does not exist."
-					return
-				fi
-			fi
-			;;
-		*)
-			ewarn "${source} will not be decrypted ..."
-			einfo "Reason: mode ${mode} is invalid."
-			return
-			;;
-		esac
-	else
-		mode=none
-	fi
-	ebegin "dm-crypt map ${target}"
-	einfo "cryptsetup will be called with : ${options} ${arg1} ${arg2} ${arg3}"
-	if [ "$mode" == "gpg" ]; then
-		: ${gpg_options:='-q -d'}
-		# gpg available ?
-		if type -p gpg >/dev/null ; then
-			for (( i = 0 ; i < 3 ; i++ ))
-			do
-				# paranoid, don't store key in a variable, pipe it so it stays very little in ram unprotected.
-				# save stdin stdout stderr "values"
-				gpg ${gpg_options} ${key} 2>/dev/null | cryptsetup ${options} ${arg1} ${arg2} ${arg3}
-				ret="$?"
-				[ "$ret" -eq 0 ] && break
-			done
-			eend "${ret}" "failure running cryptsetup"
-		else
-			ewarn "${source} will not be decrypted ..."
-			einfo "Reason: cannot find gpg application."
-			einfo "You have to install app-crypt/gnupg first."
-			einfo "If you have /usr on its own partition, try copying gpg to /bin ."
-		fi
-	else
-		if [ "$mode" == "reg" ]; then
-			cryptsetup ${options} -d ${key} ${arg1} ${arg2} ${arg3}
-			ret="$?"
-			eend "${ret}" "failure running cryptsetup"
-		else
-			cryptsetup ${options} ${arg1} ${arg2} ${arg3}
-			ret="$?"
-			eend "${ret}" "failure running cryptsetup"
-		fi
-	fi
-	if [ -d "$mntrem" ]; then
-		umount -n ${mntrem} 2>/dev/null >/dev/null
-		rmdir ${mntrem} 2>/dev/null >/dev/null
-	fi
-	splash svc_input_end ${SVCNAME} >/dev/null 2>&1
-
-	if [[ ${ret} != 0 ]] ; then
-		cryptfs_status=1
-	else
-		if [[ -n ${pre_mount} ]] ; then
-			dev="/dev/mapper/${target}"
-			ebegin "  Running pre_mount commands for ${target}"
-			eval "${pre_mount}" > /dev/null
-			ewend $? || cryptfs_status=1
-		fi
-	fi
-}
-
-# Run any post_mount commands for an individual mount
-#
-# Note: This relies on variables localized in the main body below.
-dm_crypt_execute_localmount() {
-	local mount_point
-
-	[ -z "$target" ] && [ -z "$post_mount" ] && return
-
-	if ! /sbin/cryptsetup status ${target} | egrep -q '\<active:' ; then
-		ewarn "Skipping unmapped target ${target}"
-		cryptfs_status=1
-		return
-	fi
-
-	mount_point=$(grep "/dev/mapper/${target}" /proc/mounts | cut -d' ' -f2)
-	if [[ -z ${mount_point} ]] ; then
-		ewarn "Failed to find mount point for ${target}, skipping"
-		cryptfs_status=1
-	fi
-
-	if [[ -n ${post_mount} ]] ; then
-		ebegin "Running post_mount commands for target ${target}"
-		eval "${post_mount}" >/dev/null
-		eend $? || cryptfs_status=1
-	fi
-}
-
-# Determine string lengths
-strlen() {
-	if [ -z "$1" ]
-		then
-			echo "usage: strlen <variable_name>"
-			die
-		fi
-	eval echo "\${#${1}}"
-}
-
-# Lookup optional bootparams
-parse_opt() {
-	case "$1" in
-		*\=*)
-			local key_name="`echo "$1" | cut -f1 -d=`"
-			local key_len=`strlen key_name`
-			local value_start=$((key_len+2))
-			echo "$1" | cut -c ${value_start}-
-		;;
-	esac
-}
-
-local cryptfs_status=0
-local gpg_options key loop_file target targetline options pre_mount post_mount source swap remdev
-
-CMDLINE="`cat /proc/cmdline`"
-for x in ${CMDLINE}
-do
-	case "${x}" in
-		key_timeout\=*)
-			KEY_TIMEOUT=`parse_opt "${x}"`
-			if [ ${KEY_TIMEOUT} -gt 0 ]; then
-				read_timeout="-t ${KEY_TIMEOUT}"
-			fi
-		;;
-	esac
-done
-
-if [[ -f ${conf_file} ]] && [[ -x /sbin/cryptsetup ]] ; then
-	ebegin "Setting up dm-crypt mappings"
-
-	while read -u 3 targetline ; do
-		# skip comments and blank lines
-		[[ ${targetline}\# == \#* ]] && continue
-
-		# skip service-specific openrc configs #377927
-		[[ ${targetline} == rc_* ]] && continue
-
-		# check for the start of a new target/swap
-		case ${targetline} in
-			target=*|swap=*)
-				# If we have a target queued up, then execute it
-				${execute_hook}
-
-				# Prepare for the next target/swap by resetting variables
-				unset gpg_options key loop_file target options pre_mount post_mount source swap remdev
-				;;
-
-			gpg_options=*|remdev=*|key=*|loop_file=*|options=*|pre_mount=*|post_mount=*|source=*)
-				if [[ -z ${target} && -z ${swap} ]] ; then
-					ewarn "Ignoring setting outside target/swap section: ${targetline}"
-					continue
-				fi
-				;;
-
-			dmcrypt_max_timeout=*)
-				# ignore global options
-				continue
-				;;
-
-			*)
-				ewarn "Skipping invalid line in ${conf_file}: ${targetline}"
-				;;
-		esac
-
-		# Queue this setting for the next call to dm_crypt_execute_xxx
-		eval "${targetline}"
-	done 3< ${conf_file}
-
-	# If we have a target queued up, then execute it
-	${execute_hook}
-
-	ewend ${cryptfs_status} "Failed to setup dm-crypt devices"
-fi
-
-# vim:ts=4
diff --git a/sys-fs/cryptsetup/files/1.1.3-dm-crypt-stop.sh b/sys-fs/cryptsetup/files/1.1.3-dm-crypt-stop.sh
deleted file mode 100644
index 548269c0ae3b..000000000000
--- a/sys-fs/cryptsetup/files/1.1.3-dm-crypt-stop.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-# /lib/rcscripts/addons/dm-crypt-stop.sh
-
-# For backwards compatibility with baselayout < 1.13.0 #174256
-: ${SVCNAME:=${myservice}}
-
-# See notes in dm-crypt-start.sh
-execute_hook="dm_crypt_execute_dmcrypt"
-conf_file="dmcrypt"
-case ${SVCNAME} in
-	dmcrypt.*)  conf_file="${SVCNAME}" ;;
-esac
-conf_file="/etc/conf.d/${conf_file}"
-
-# Try to remove any dm-crypt mappings
-csetup=/sbin/cryptsetup
-if [ -f ${conf_file} ] && [ -x "$csetup" ]
-then
-	einfo "Removing dm-crypt mappings"
-
-	/bin/egrep "^(target|swap)" ${conf_file} | \
-	while read targetline
-	do
-		target=
-		swap=
-
-		eval ${targetline}
-
-		[ -n "${swap}" ] && target=${swap}
-		[ -z "${target}" ] && ewarn "Invalid line in ${conf_file}: ${targetline}"
-
-		ebegin "Removing dm-crypt mapping for: ${target}"
-		${csetup} remove ${target}
-		eend $? "Failed to remove dm-crypt mapping for: ${target}"
-	done
-
-	if [[ -n $(/bin/egrep -e "^(source=)./dev/loop*" ${conf_file}) ]] ; then
-		einfo "Taking down any dm-crypt loop devices"
-		/bin/egrep -e "^(source)" ${conf_file} | while read sourceline
-		do
-			source=
-			eval ${sourceline}
-			if [[ -n $(echo ${source} | grep /dev/loop) ]] ; then
-				ebegin "   Taking down ${source}"
-				/sbin/losetup -d ${source}
-				eend $? "  Failed to remove loop"
-			fi
-		done
-	fi
-fi
-
-# vim:ts=4
diff --git a/sys-fs/cryptsetup/files/cryptsetup-1.0.6-udevsettle.patch b/sys-fs/cryptsetup/files/cryptsetup-1.0.6-udevsettle.patch
deleted file mode 100644
index 6860a7c4c34c..000000000000
--- a/sys-fs/cryptsetup/files/cryptsetup-1.0.6-udevsettle.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-2008-09-13  Doug Goldstein  <cardoe@gentoo.org>
-	* switch to udevadm settle since udevsettle has been deprecated
-	  and finally removed with udev 126.
-
---- cryptsetup-1.0.6/lib/libdevmapper.c
-+++ cryptsetup-1.0.6/lib/libdevmapper.c
-@@ -18,11 +18,11 @@
- 
- #define	CRYPT_TARGET	"crypt"
- 
--#define UDEVSETTLE	"/sbin/udevsettle"
-+#define UDEVSETTLE	"/sbin/udevadm settle"
- 
--static void run_udevsettle(void)
-+static int run_udevsettle(void)
- {
--	system(UDEVSETTLE);
-+	return system(UDEVSETTLE);
- }
- 
- static void set_dm_error(int level, const char *file, int line,
diff --git a/sys-fs/cryptsetup/files/1.0.6-dmcrypt.confd b/sys-fs/cryptsetup/files/dmcrypt-1.0.6.confd
index 35a1fd2cb3d0..35a1fd2cb3d0 100644
--- a/sys-fs/cryptsetup/files/1.0.6-dmcrypt.confd
+++ b/sys-fs/cryptsetup/files/dmcrypt-1.0.6.confd
diff --git a/sys-fs/cryptsetup/files/dmcrypt.rc b/sys-fs/cryptsetup/files/dmcrypt.rc
deleted file mode 100755
index 130036b9202f..000000000000
--- a/sys-fs/cryptsetup/files/dmcrypt.rc
+++ /dev/null
@@ -1,346 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/files/dmcrypt.rc,v 1.4 2012/05/11 08:33:01 vapier Exp $
-
-depend() {
-	before checkfs fsck
-}
-
-# We support multiple dmcrypt instances based on $SVCNAME
-execute_hook="dm_crypt_execute_dmcrypt"
-# XXX: Should we drop this ?
-# execute_hook="dm_crypt_execute_localmount"
-conf_file="/etc/conf.d/${SVCNAME}"
-
-# Get splash helpers if available.
-if [ -e /sbin/splash-functions.sh ] ; then
-	. /sbin/splash-functions.sh
-fi
-
-# Setup mappings for an individual target/swap
-# Note: This relies on variables localized in the main body below.
-dm_crypt_execute_dmcrypt() {
-	local dev ret mode foo
-
-	if [ -n "${target}" ] ; then
-		# let user set options, otherwise leave empty
-		: ${options:=' '}
-	elif [ -n "${swap}" ] ; then
-		if cryptsetup isLuks ${source} 2>/dev/null ; then
-			ewarn "The swap you have defined is a LUKS partition. Aborting crypt-swap setup."
-			return
-		fi
-		target=${swap}
-		# swap contents do not need to be preserved between boots, luks not required.
-		# suspend2 users should have initramfs's init handling their swap partition either way.
-		: ${options:='-c aes -h sha1 -d /dev/urandom'}
-		: ${pre_mount:='mkswap ${dev}'}
-	else
-		return
-	fi
-	if [ -z "${source}" ] && [ ! -e "${source}" ] ; then
-		ewarn "source \"${source}\" for ${target} missing, skipping..."
-		return
-	fi
-
-	if [ -n "${loop_file}" ] ; then
-		dev="/dev/mapper/${target}"
-		ebegin "  Setting up loop device ${source}"
-		losetup ${source} ${loop_file}
-	fi
-
-	# cryptsetup:
-	# luksOpen <device> <name>      # <device> is $source
-	# create   <name>   <device>    # <name>   is $target
-	local arg1="create" arg2="${target}" arg3="${source}" luks=0
-
-	cryptsetup isLuks ${source} 2>/dev/null && { arg1="luksOpen"; arg2="${source}"; arg3="${target}"; luks=1; }
-
-	# Older versions reported:
-	#	${target} is active:
-	# Newer versions report:
-	#	${target} is active[ and is in use.]
-	if cryptsetup status ${target} | egrep -q ' is active' ; then
-		einfo "dm-crypt mapping ${target} is already configured"
-		return
-	fi
-	splash svc_input_begin ${SVCNAME} >/dev/null 2>&1
-
-	# Handle keys
-	if [ -n "${key}" ] ; then
-		read_abort() {
-			# some colors
-			local ans savetty resettty
-			[ -z "${NORMAL}" ] && eval $(eval_ecolors)
-			einfon "  $1? (${WARN}yes${NORMAL}/${GOOD}No${NORMAL}) "
-			shift
-			# This is ugly as s**t.  But POSIX doesn't provide `read -t`, so
-			# we end up having to implement our own crap with stty/etc...
-			savetty=$(stty -g)
-			resettty='stty ${savetty}; trap - EXIT HUP INT TERM'
-			trap 'eval "${resettty}"' EXIT HUP INT TERM
-			stty -icanon
-			[ "${1}" = -t ] && stty min 0 time "$(( $2 * 10 ))"
-			ans=$(dd count=1 bs=1 2>/dev/null) || ans=''
-			eval "${resettty}"
-			if [ -z "${ans}" ] ; then
-				printf '\r'
-			else
-				echo
-			fi
-			case ${ans} in
-				[yY]) return 0;;
-				*) return 1;;
-			esac
-		}
-
-		# Notes: sed not used to avoid case where /usr partition is encrypted.
-		mode=${key/*:/} && ( [ "${mode}" = "${key}" ] || [ -z "${mode}" ] ) && mode=reg
-		key=${key/:*/}
-		case "${mode}" in
-		gpg|reg)
-			# handle key on removable device
-			if [ -n "${remdev}" ] ; then
-				# temp directory to mount removable device
-				local mntrem="${RC_SVCDIR}/dm-crypt-remdev.$$"
-				if [ ! -d "${mntrem}" ] ; then
-					if ! mkdir -p "${mntrem}" ; then
-						ewarn "${source} will not be decrypted ..."
-						einfo "Reason: Unable to create temporary mount point '${mntrem}'"
-						return
-					fi
-				fi
-				i=0
-				einfo "Please insert removable device for ${target}"
-				while [ ${i} -lt ${dmcrypt_max_timeout:-120} ] ; do
-					foo=""
-					if mount -n -o ro "${remdev}" "${mntrem}" 2>/dev/null >/dev/null ; then
-						# keyfile exists?
-						if [ ! -e "${mntrem}${key}" ] ; then
-							umount -n "${mntrem}"
-							rmdir "${mntrem}"
-							einfo "Cannot find ${key} on removable media."
-							read_abort "Abort" ${read_timeout:--t 1} && return
-						else
-							key="${mntrem}${key}"
-							break
-						fi
-					else
-						[ -e "${remdev}" ] \
-							&& foo="mount failed" \
-							|| foo="mount source not found"
-					fi
-					: $((i += 1))
-					read_abort "Stop waiting after $i attempts (${foo})" -t 1 && return
-				done
-			else    # keyfile ! on removable device
-				if [ ! -e "${key}" ] ; then
-					ewarn "${source} will not be decrypted ..."
-					einfo "Reason: keyfile ${key} does not exist."
-					return
-				fi
-			fi
-			;;
-		*)
-			ewarn "${source} will not be decrypted ..."
-			einfo "Reason: mode ${mode} is invalid."
-			return
-			;;
-		esac
-	else
-		mode=none
-	fi
-	ebegin "  ${target} using: ${options} ${arg1} ${arg2} ${arg3}"
-	if [ "${mode}" = "gpg" ] ; then
-		: ${gpg_options:='-q -d'}
-		# gpg available ?
-		if type -p gpg >/dev/null ; then
-			for i in 0 1 2 ; do
-				# paranoid, don't store key in a variable, pipe it so it stays very little in ram unprotected.
-				# save stdin stdout stderr "values"
-				gpg ${gpg_options} ${key} 2>/dev/null | cryptsetup ${options} ${arg1} ${arg2} ${arg3}
-				ret=$?
-				[ ${ret} -eq 0 ] && break
-			done
-			eend ${ret} "failure running cryptsetup"
-		else
-			ewarn "${source} will not be decrypted ..."
-			einfo "Reason: cannot find gpg application."
-			einfo "You have to install app-crypt/gnupg first."
-			einfo "If you have /usr on its own partition, try copying gpg to /bin ."
-		fi
-	else
-		if [ "${mode}" = "reg" ] ; then
-			cryptsetup ${options} -d ${key} ${arg1} ${arg2} ${arg3}
-			ret=$?
-			eend ${ret} "failure running cryptsetup"
-		else
-			cryptsetup ${options} ${arg1} ${arg2} ${arg3}
-			ret=$?
-			eend ${ret} "failure running cryptsetup"
-		fi
-	fi
-	if [ -d "${mntrem}" ] ; then
-		umount -n ${mntrem} 2>/dev/null >/dev/null
-		rmdir ${mntrem} 2>/dev/null >/dev/null
-	fi
-	splash svc_input_end ${SVCNAME} >/dev/null 2>&1
-
-	if [ ${ret} -ne 0 ] ; then
-		cryptfs_status=1
-	else
-		if [ -n "${pre_mount}" ] ; then
-			dev="/dev/mapper/${target}"
-			ebegin "    pre_mount: ${pre_mount}"
-			eval "${pre_mount}" > /dev/null
-			ewend $? || cryptfs_status=1
-		fi
-	fi
-}
-
-# Run any post_mount commands for an individual mount
-#
-# Note: This relies on variables localized in the main body below.
-dm_crypt_execute_localmount() {
-	local mount_point
-
-	[ -z "${target}" ] && [ -z "${post_mount}" ] && return
-
-	if ! cryptsetup status ${target} | egrep -q '\<active:' ; then
-		ewarn "Skipping unmapped target ${target}"
-		cryptfs_status=1
-		return
-	fi
-
-	mount_point=$(grep "/dev/mapper/${target}" /proc/mounts | cut -d' ' -f2)
-	if [ -z "${mount_point}" ] ; then
-		ewarn "Failed to find mount point for ${target}, skipping"
-		cryptfs_status=1
-	fi
-
-	if [ -n "${post_mount}" ] ; then
-		ebegin "Running post_mount commands for target ${target}"
-		eval "${post_mount}" >/dev/null
-		eend $? || cryptfs_status=1
-	fi
-}
-
-# Lookup optional bootparams
-get_bootparam_val() {
-	# We're given something like:
-	#    foo=bar=cow
-	# Return the "bar=cow" part.
-	case $1 in
-	*\=*)
-		local key=$(echo "$1" | cut -f1 -d=)
-		echo "$1" | cut -c $(( ${#key} + 2 ))
-		;;
-	esac
-}
-
-start() {
-	local header=true cryptfs_status=0
-	local gpg_options key loop_file target targetline options pre_mount post_mount source swap remdev
-
-	local x
-	for x in $(cat /proc/cmdline) ; do
-		case "${x}" in
-		key_timeout\=*)
-			local KEY_TIMEOUT=$(get_bootparam_val "${x}")
-			if [ ${KEY_TIMEOUT} -gt 0 ] ; then
-				read_timeout="-t ${KEY_TIMEOUT}"
-			fi
-		;;
-		esac
-	done
-
-	while read -u 3 targetline ; do
-		case ${targetline} in
-		# skip comments and blank lines
-		""|"#"*) continue ;;
-		# skip service-specific openrc configs #377927
-		rc_*) continue ;;
-		esac
-
-		${header} && ebegin "Setting up dm-crypt mappings"
-		header=false
-
-		# check for the start of a new target/swap
-		case ${targetline} in
-		target=*|swap=*)
-			# If we have a target queued up, then execute it
-			${execute_hook}
-
-			# Prepare for the next target/swap by resetting variables
-			unset gpg_options key loop_file target options pre_mount post_mount source swap remdev
-			;;
-
-		gpg_options=*|remdev=*|key=*|loop_file=*|options=*|pre_mount=*|post_mount=*|source=*)
-			if [ -z "${target}${swap}" ] ; then
-				ewarn "Ignoring setting outside target/swap section: ${targetline}"
-				continue
-			fi
-			;;
-
-		dmcrypt_max_timeout=*)
-			# ignore global options
-			continue
-			;;
-
-		*)
-			ewarn "Skipping invalid line in ${conf_file}: ${targetline}"
-			;;
-		esac
-
-		# Queue this setting for the next call to dm_crypt_execute_xxx
-		eval "${targetline}"
-	done 3< ${conf_file}
-
-	# If we have a target queued up, then execute it
-	${execute_hook}
-
-	ewend ${cryptfs_status} "Failed to setup dm-crypt devices"
-}
-
-stop() {
-	local line header
-
-	# Break down all mappings
-	header=true
-	egrep "^(target|swap)=" ${conf_file} | \
-	while read line ; do
-		${header} && einfo "Removing dm-crypt mappings"
-		header=false
-
-		target= swap=
-		eval ${line}
-
-		[ -n "${swap}" ] && target=${swap}
-		if [ -z "${target}" ] ; then
-			ewarn "invalid line in ${conf_file}: ${line}"
-			continue
-		fi
-
-		ebegin "  ${target}"
-		cryptsetup remove ${target}
-		eend $?
-	done
-
-	# Break down loop devices
-	header=true
-	grep '^source=./dev/loop' ${conf_file} | \
-	while read line ; do
-		${header} && einfo "Detaching dm-crypt loop devices"
-		header=false
-
-		source=
-		eval ${line}
-
-		ebegin "  ${source}"
-		losetup -d "${source}"
-		eend $?
-	done
-
-	return 0
-}