stop enabling USE=static by default

Package-Manager: portage-2.2.0_alpha92/cvs/Linux x86_64

3 files changed, 121 insertions, 9 deletions

diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog
index d5c5bf1b4646..37b6583177a5 100644
--- a/sys-fs/cryptsetup/ChangeLog
+++ b/sys-fs/cryptsetup/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-fs/cryptsetup
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.126 2012/03/20 17:36:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.127 2012/03/20 18:53:07 ssuominen Exp $
+
+*cryptsetup-1.4.1-r1 (20 Mar 2012)
+
+  20 Mar 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +cryptsetup-1.4.1-r1.ebuild:
+  Don't enable USE="static" by default anymore because initramfs is required
+  with latest udev for separate /usr in anycase. This was a workaround for
+  cross / and /usr linking.
 
   20 Mar 2012; Samuli Suominen <ssuominen@gentoo.org>
   cryptsetup-1.2.0-r1.ebuild, cryptsetup-1.4.1.ebuild:
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index fa8ce7587fc8..23ad546662c9 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -20,17 +20,18 @@ EBUILD cryptsetup-1.0.6-r2.ebuild 3150 RMD160 997496f32ffb972a4d21efb80cb0ccedf2
 EBUILD cryptsetup-1.1.2.ebuild 3382 RMD160 c737fb8fb63a11c15c1af86db25fafc8a32e152a SHA1 4cc2311e92c429d519d99c126434b4e2ca6375cf SHA256 6445f68c8a2f1497a771cc07466f0ee6a0b23cdeb257c7db2899a1f7b247d452
 EBUILD cryptsetup-1.1.3-r3.ebuild 3467 RMD160 5a95d64bff7d3dafe21ea0176456abea73319b51 SHA1 e60b7e828697ff8ec380f9b84e716e166a553ba5 SHA256 f8785d631199f73b31abeebc9a5dd335a07c124f1688557953b89be462d7b48e
 EBUILD cryptsetup-1.2.0-r1.ebuild 3693 RMD160 c03f9fad5e18fb9ae52dadba7427ba8e1eb08ac4 SHA1 684ae967abbf890fc1c61c44f7ae7b4e37955b5e SHA256 a579ec17a8d09d5ed5a3d1d79b8cedf499783fcbfcb0d1cb179c1e991eb12360
+EBUILD cryptsetup-1.4.1-r1.ebuild 3405 RMD160 fb3cac0add84ef03acbec64492ad0d1317129ec3 SHA1 18ce36f3c7d04fc7366e4ff935e822beeb945474 SHA256 aa399925f2adcd8e7f3c5e554e0c4a75c788a744573cf905f559ce0ebd1ddf77
 EBUILD cryptsetup-1.4.1.ebuild 3397 RMD160 92e01bdfbf3ffc36358eabe2c482afbc604fecc7 SHA1 11c355dfa31eee67128300134ac6c7968193713b SHA256 ef2233b66242876e592df93fd8032e60613375ba52d974633386eb2f233c6a37
-MISC ChangeLog 18695 RMD160 21febd9ba871b35a86433c445b6ecaca53b5c7c2 SHA1 2f1c8553026fb4015fc5f59e25df910b188f3983 SHA256 384f1bf86bfc25cde8683756989bafa4bbee8da9dccd7f45967286261fb4f9de
+MISC ChangeLog 18997 RMD160 21a2ffa3200cf733e7c72f7bcef4ea45f47befd9 SHA1 ad21474e7eda248acbbf0eb0804c3c0e018c39ed SHA256 4decf51aff55610d185161432e20a43a741d733c6d1355c2ce9bf63798f56a94
 MISC metadata.xml 239 RMD160 81512c49e64b6e70c7b746ba09d3e6fce4c7bc89 SHA1 c4085a72e46fe6bcea5bdff780007791eae6db4b SHA256 aebd5282fb892100f348eba1ed27edd27e7296356897c6f5314674f8abb4b51a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPaMAxAAoJEEdUh39IaPFNzXYH/2WkD3e1gU9qVGusOICkRdaQ
-FuxMi9iOLRnvfjpJdRF95C3N5thgispXpFmPSQMS+6XDte7wnh5i8Vsa/+tzwnIN
-yTguEU/5V9lKpR0sBg5twvSbWOV2qt5xE/ehvoTpuTv2dV4KBeiNUrfbvKvB6Ony
-b/9TPURQ8L8po1hidjLyw3v6Pg9NXv8eB5kIMoVhcsRbkm+ML/+Kh8drQ6piTQmn
-urzvcWxc7c05+kxwmgHbWY1yNhulbBqbQxiMHwQwDvlDLsF69gpdfkXQYNW+j0gh
-fftigDwgM+oI9rKp8RzamQRNXP6WnEF9VABCpQ55ZaldmsMR9NzvIdiUs6ewl4s=
-=nDNp
+iQEcBAEBAgAGBQJPaNIZAAoJEEdUh39IaPFN/SoIAIFntT873++hcYBEkb53Nm2s
+9krq995DHM1WYdf8NnCyMnPxpWYJFvU6T8++e0TU7W4yAybMsJWat1OvOJuON7Fc
+Qn0imvDgcW8otn1hKNgK80OeNAyx0j7OKFGc/2A67Ef4nuEtTUxENQgmBZGjN9/9
+Y53RrJLqs474MF9gDNxsFCyU7DRFUFhdLYIJP/4YUSZbSfAwT8uyeinJK2InF+91
+08Q8TmUlReXb5C/DDTXwnptvxghESWrJBOZnjug3H++LoWQBwGkgdJfwMukCOfSV
+h5T78Xv72lnMZQxUQIuTW3GQhJ9ZoccKL4j/r2ryVWhQWDNNJ7EjFfLBv2pYwMU=
+=un6n
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/cryptsetup/cryptsetup-1.4.1-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..be18daf5aea6
--- /dev/null
+++ b/sys-fs/cryptsetup/cryptsetup-1.4.1-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.4.1-r1.ebuild,v 1.1 2012/03/20 18:53:07 ssuominen Exp $
+
+EAPI="2"
+
+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"
+
+S=${WORKDIR}/${MY_P}
+
+RDEPEND="!<sys-apps/baselayout-2
+	!static? (
+		>=dev-libs/libgcrypt-1.1.42
+		dev-libs/libgpg-error
+		>=dev-libs/popt-1.7
+		>=sys-apps/util-linux-2.17.2
+		>=sys-fs/lvm2-2.02.64
+	)
+	>=sys-fs/udev-124
+	>=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[static-libs]
+		|| ( >=sys-fs/lvm2-2.02.88[static-libs] <sys-fs/lvm2-2.02.88 )
+		|| ( >=sys-fs/udev-182[static-libs] <=sys-fs/udev-171-r5 )
+	)"
+
+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 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
+
+	newconfd "${FILESDIR}"/1.0.6-dmcrypt.confd dmcrypt || die
+	newinitd "${FILESDIR}"/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"
+}