Version bump (bug #520172). Removed old

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

3 files changed, 8 insertions, 123 deletions

diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog
index 3ebd727b7587..484390a9d14c 100644
--- a/sys-fs/cryptsetup/ChangeLog
+++ b/sys-fs/cryptsetup/ChangeLog
@@ -1,6 +1,12 @@
 # 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.170 2014/07/25 19:59:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.171 2014/08/19 16:15:17 polynomial-c Exp $
+
+*cryptsetup-1.6.6 (19 Aug 2014)
+
+  19 Aug 2014; Lars Wendler <polynomial-c@gentoo.org> -cryptsetup-1.6.3.ebuild,
+  -cryptsetup-1.6.4.ebuild, +cryptsetup-1.6.6.ebuild:
+  Version bump (bug #520172). Removed old.
 
   25 Jul 2014; Samuli Suominen <ssuominen@gentoo.org>
   cryptsetup-1.0.6-r2.ebuild, cryptsetup-1.1.3-r3.ebuild,
diff --git a/sys-fs/cryptsetup/cryptsetup-1.6.3.ebuild b/sys-fs/cryptsetup/cryptsetup-1.6.3.ebuild
deleted file mode 100644
index 31b047e2d7a9..000000000000
--- a/sys-fs/cryptsetup/cryptsetup-1.6.3.ebuild
+++ /dev/null
@@ -1,121 +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.6.3.ebuild,v 1.3 2014/07/25 19:59:10 ssuominen Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit autotools python-single-r1 linux-info libtool eutils
-
-DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
-HOMEPAGE="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"
-CRYPTO_BACKENDS="+gcrypt kernel nettle openssl"
-# we don't support nss since it doesn't allow cryptsetup to be built statically
-# and it's missing ripemd160 support so it can't provide full backward compatibility
-IUSE="${CRYPTO_BACKENDS} nls python reencrypt static static-libs udev urandom"
-REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-LIB_DEPEND="dev-libs/libgpg-error[static-libs(+)]
-	dev-libs/popt[static-libs(+)]
-	sys-apps/util-linux[static-libs(+)]
-	gcrypt? ( dev-libs/libgcrypt:0[static-libs(+)] )
-	nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
-	openssl? ( dev-libs/openssl[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\(+\)\]}
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	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
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
-	eautoreconf
-}
-
-src_configure() {
-	if use kernel ; then
-		ewarn "Note that kernel backend is very slow for this type of operation"
-		ewarn "and is provided mainly for embedded systems wanting to avoid"
-		ewarn "userspace crypto libraries."
-	fi
-
-	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 udev) \
-		$(use_enable !urandom dev-random) \
-		--with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/}; do use ${x} && echo ${x} ; done)
-}
-
-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
-	prune_libtool_files --modules
-
-	newconfd "${FILESDIR}"/1.0.6-dmcrypt.confd dmcrypt
-	newinitd "${FILESDIR}"/1.5.1-dmcrypt.rc dmcrypt
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		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"
-	fi
-}
diff --git a/sys-fs/cryptsetup/cryptsetup-1.6.4.ebuild b/sys-fs/cryptsetup/cryptsetup-1.6.6.ebuild
index ae0de3fe3de8..7d60bf6dc574 100644
--- a/sys-fs/cryptsetup/cryptsetup-1.6.4.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-1.6.6.ebuild
@@ -1,6 +1,6 @@
 # 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.6.4.ebuild,v 1.2 2014/07/25 19:59:09 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.6.6.ebuild,v 1.1 2014/08/19 16:15:17 polynomial-c Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )