sys-kernel/genkernel: Migrate to cryptsetup use flag (bug #414523)

Package-Manager: portage-2.1.10.56/cvs/Linux x86_64

5 files changed, 36 insertions, 15 deletions

diff --git a/sys-kernel/genkernel/ChangeLog b/sys-kernel/genkernel/ChangeLog
index c8594bff137d..e706973f8236 100644
--- a/sys-kernel/genkernel/ChangeLog
+++ b/sys-kernel/genkernel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-kernel/genkernel
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.297 2012/04/16 02:19:02 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.298 2012/05/03 22:26:18 sping Exp $
+
+  03 May 2012; Sebastian Pipping <sping@gentoo.org> genkernel-3.4.30.ebuild,
+  genkernel-9999.ebuild, metadata.xml:
+  Migrate from use flag 'crypt' to 'cryptsetup' (bug #414523), sync live ebuild
 
 *genkernel-3.4.30 (16 Apr 2012)
 
diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index a324ee44f91b..739916c601f1 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -51,14 +51,14 @@ EBUILD genkernel-3.4.26.ebuild 5135 RMD160 1bea77da3789872943fffd65b69eb1052d795
 EBUILD genkernel-3.4.27.ebuild 5190 RMD160 dc7234e0ccb09f8e6b808693a15917d1319b4793 SHA1 1180356118966d0a691f29a6a72a8d65f3d8554a SHA256 83fc6c0932e75123a8b1a66dd69ab842d4d944c529387a753f38db137a04ac83
 EBUILD genkernel-3.4.28.ebuild 5190 RMD160 f79fa49b369a29462e0bac8e0645903fa49d0524 SHA1 6767421f6f7b0404e41242dbd922c04931986ac5 SHA256 d7d7918f60d06f7d23b7a272810789061d94c9449e0c66d747b98c809c069e78
 EBUILD genkernel-3.4.29.ebuild 5190 RMD160 4f93afeb76330cb2ae6eca31ce5840db89e5b32b SHA1 0c49781b0c80315bf43fa16ce93567f23299870a SHA256 db5f9fdd396cd7d5de5faa50a52d3b9ffdd6ac0a3988c8e731153c1780ad6347
-EBUILD genkernel-3.4.30.ebuild 5182 RMD160 bc99560066b14dcc17e569f217dfa7572a76de6b SHA1 f5db9ebf054e732a00ac535e8da5eb99fe925b9b SHA256 69965ba3f1567c06707f35a18178a7e41e1336ccff2febf75342260f6bdcc605
-EBUILD genkernel-9999.ebuild 5189 RMD160 e88d2a5e71b10d38d672bb2a924d81cfab1bc10e SHA1 0553c0c2eac226a3365bb9cdbdd556d732eef6d5 SHA256 a881f81cee85138b6d5700afad2bc46780af710dfb85919b11a02bb6a037b153
-MISC ChangeLog 55450 RMD160 408879cdba2659b4e27899225084d12c6ffc406e SHA1 888e0d988a44cf603b6805cd9db02b6eab2a353c SHA256 b5372078c2fa3adee7ed06ce8863f7f19f33b77098b5c4cba807f3239b166139
-MISC metadata.xml 205 RMD160 4acb9018c91945d9782cfb80cef7ee98787e7672 SHA1 ead70f12ee5717a53646361197f53f55adb8b25a SHA256 00ad951be56555b432a47451bbf11dd4830ed56aa377d1bc06cbf431525315a3
+EBUILD genkernel-3.4.30.ebuild 5570 RMD160 deffb90c7df1b271414d0fb73a12a902baca1687 SHA1 9375348f4638bd6f1bd7a2f215ed8a6a545dff3b SHA256 7975ce634c70b3c67c330cd164ea1efa61bb0044ae1dd494fc5d40fb1c194c7b
+EBUILD genkernel-9999.ebuild 5569 RMD160 9f565cbf01327f4cbca39dccacea703abab6168a SHA1 904f2f8711a8751482c7affe95e0817567d9f897 SHA256 ed549b5479a1a60fa05b8d451ef6827b6df4896f2137a7f53eff535c3e97f44e
+MISC ChangeLog 55647 RMD160 b897cbadbfc3959e7c2906fe75d187f3b6aabc0d SHA1 9b938def0fe4af3826e847c9c3bf2d967cf73f09 SHA256 c9ad88d6320d55ced75ca20a73edae707b99d3ba0e7cdbbb82a87492f5ce66bd
+MISC metadata.xml 324 RMD160 3527070c43df4e4a7e2f40f941b6d683ae662e84 SHA1 f6707c554d2b72aa2b8e29767a66134b533e2d9a SHA256 c126eb3c7144839781275d68804421eec596e3b82515780c76697ac9e106bcf0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+LgYEACgkQsAvGakAaFgAELQCgjqF4cbl75braNAsdF+iTPxiw
-kzwAoIFmbWHqlml6fXBauvukb3pq0vD9
-=Svt/
+iEYEARECAAYFAk+jBfUACgkQsAvGakAaFgCc+gCeO0zByfCfeYf5SvMLSAFzdpdQ
+5nQAn0wT0qzt8yEk3ZI/m1HZRlTxQUnt
+=uhfj
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/genkernel/genkernel-3.4.30.ebuild b/sys-kernel/genkernel/genkernel-3.4.30.ebuild
index 0f710f916fa9..7daea7b0b715 100644
--- a/sys-kernel/genkernel/genkernel-3.4.30.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.4.30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.30.ebuild,v 1.1 2012/04/16 02:19:02 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.30.ebuild,v 1.2 2012/05/03 22:26:18 sping Exp $
 
 # genkernel-9999        -> latest Git branch "master"
 # genkernel-VERSION     -> normal genkernel release
@@ -58,12 +58,12 @@ HOMEPAGE="http://www.gentoo.org"
 LICENSE="GPL-2"
 SLOT="0"
 RESTRICT=""
-IUSE="crypt ibm selinux"
+IUSE="crypt cryptsetup ibm selinux"  # Keep 'crypt' in to keep 'use crypt' below working!
 
 DEPEND="sys-fs/e2fsprogs
 	selinux? ( sys-libs/libselinux )"
 RDEPEND="${DEPEND}
-		crypt? ( sys-fs/cryptsetup )
+		cryptsetup? ( sys-fs/cryptsetup )
 		app-arch/cpio
 		app-misc/pax-utils
 		!<sys-apps/openrc-0.9.9"
@@ -153,6 +153,13 @@ pkg_postinst() {
 	ewarn "The LUKS support has changed from versions prior to 3.4.4.  Now,"
 	ewarn "you use crypt_root=/dev/blah instead of real_root=luks:/dev/blah."
 	echo
+	if use crypt && ! use cryptsetup ; then
+		ewarn "Local use flag 'crypt' has been renamed to 'cryptsetup' (bug #414523)."
+		ewarn "Please set flag 'cryptsetup' for this very package if you would like"
+		ewarn "to have genkernel create an initramfs with LUKS support."
+		ewarn "Sorry for the inconvenience."
+		echo
+	fi
 
 	bash-completion_pkg_postinst
 }
diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-9999.ebuild
index ed4d974f0083..af788bd5323a 100644
--- a/sys-kernel/genkernel/genkernel-9999.ebuild
+++ b/sys-kernel/genkernel/genkernel-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-9999.ebuild,v 1.33 2012/03/22 15:38:48 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-9999.ebuild,v 1.34 2012/05/03 22:26:18 sping Exp $
 
 # genkernel-9999        -> latest Git branch "master"
 # genkernel-VERSION     -> normal genkernel release
@@ -58,12 +58,12 @@ HOMEPAGE="http://www.gentoo.org"
 LICENSE="GPL-2"
 SLOT="0"
 RESTRICT=""
-IUSE="crypt ibm selinux"
+IUSE="crypt cryptsetup ibm selinux"  # Keep 'crypt' in to keep 'use crypt' below working!
 
 DEPEND="sys-fs/e2fsprogs
 	selinux? ( sys-libs/libselinux )"
 RDEPEND="${DEPEND}
-		crypt? ( sys-fs/cryptsetup[static] )
+		cryptsetup? ( sys-fs/cryptsetup )
 		app-arch/cpio
 		app-misc/pax-utils
 		!<sys-apps/openrc-0.9.9"
@@ -153,6 +153,13 @@ pkg_postinst() {
 	ewarn "The LUKS support has changed from versions prior to 3.4.4.  Now,"
 	ewarn "you use crypt_root=/dev/blah instead of real_root=luks:/dev/blah."
 	echo
+	if use crypt && ! use cryptsetup ; then
+		ewarn "Local use flag 'crypt' has been renamed to 'cryptsetup' (bug #414523)."
+		ewarn "Please set flag 'cryptsetup' for this very package if you would like"
+		ewarn "to have genkernel create an initramfs with LUKS support."
+		ewarn "Sorry for the inconvenience."
+		echo
+	fi
 
 	bash-completion_pkg_postinst
 }
diff --git a/sys-kernel/genkernel/metadata.xml b/sys-kernel/genkernel/metadata.xml
index 2dff08258dc2..19c622da185a 100644
--- a/sys-kernel/genkernel/metadata.xml
+++ b/sys-kernel/genkernel/metadata.xml
@@ -3,6 +3,9 @@
 
 <pkgmetadata>
 <maintainer>
-  <email>genkernel@gentoo.org</email>
+	<email>genkernel@gentoo.org</email>
 </maintainer>
+<use>
+	<flag name='cryptsetup'>Enable support for Luks disk enrcyption using <pkg>sys-fs/cryptsetup</pkg></flag>
+</use>
 </pkgmetadata>