Merge branch 'experimental' using --no-ff

ChangeLog

@@ -5,6 +5,13 @@
 # Distributed under the GPL v2
 # $Id$
 
+  30 Jan 2011; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh:
+  Give blkid of e2fsprogs precedence over busybox re-write by putting it into
+  /sbin, not /bin (bug #352746)
+
+  30 Jan 2011; Sebastian Pipping <sping@gentoo.org> arch/x86_64/kernel-config:
+  Enable CONFIG_USB_SUSPEND and CONFIG_PM_RUNTIME for x86_64 (bug #351376)
+
   30 Jan 2011; Sebastian Pipping <sping@gentoo.org> genkernel:
   Bump version to 3.4.12.4
 

doc/genkernel.8.txt

@@ -283,7 +283,7 @@ INITIALIZATION
 *--gpg*::
     Add support for GnuPG 1.x, the portable standalone branch of GnuPG.
     A key can be made from
-    `gpg --encrypt --symmetric /path/to/LUKS-key > /path/to/LUKS-key.gpg` .
+    `gpg --symmetric -o /path/to/LUKS-key.gpg /path/to/LUKS-key` .
     After that, re-point the *root_key* argument to the new .gpg file.
 
 *--no-busybox*::

gen_funcs.sh

@@ -186,10 +186,6 @@ arch_replace() {
   var_replace "ARCH" "${ARCH}" "${1}"
 }
 
-kv_replace() {
-  var_replace "KV" "${KV}" "${1}"
-}
-
 cache_replace() {
   var_replace "CACHE" "${CACHE_DIR}" "${1}"
 }

gen_initramfs.sh

@@ -75,10 +75,10 @@ append_blkid(){
 		rm -r "${TEMP}/initramfs-blkid-temp/"
 	fi
 	cd ${TEMP}
-	mkdir -p "${TEMP}/initramfs-blkid-temp/bin/"
-	[ "${DISKLABEL}" = '1' ] && { /bin/bzip2 -dc "${BLKID_BINCACHE}" > "${TEMP}/initramfs-blkid-temp/bin/blkid" ||
+	mkdir -p "${TEMP}/initramfs-blkid-temp/sbin/"
+	[ "${DISKLABEL}" = '1' ] && { /bin/bzip2 -dc "${BLKID_BINCACHE}" > "${TEMP}/initramfs-blkid-temp/sbin/blkid" ||
 		gen_die "Could not extract blkid binary cache!"; }
-	chmod a+x "${TEMP}/initramfs-blkid-temp/bin/blkid"
+	chmod a+x "${TEMP}/initramfs-blkid-temp/sbin/blkid"
 	cd "${TEMP}/initramfs-blkid-temp/"
 	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
 			|| gen_die "compressing blkid cpio"

maintenance/docmatcher.py

@@ -21,7 +21,7 @@ for app in ('DEVICE_MAPPER', 'UNIONFS_FUSE', 'BUSYBOX', 'DMRAID', 'LVM', 'ISCSI'
 EXTRA_VARIABLES = tuple(EXTRA_VARIABLES)
 
 IGNORE_OPTIONS = ('help', 'version')
-_GPG_PARAMETERS = ('encrypt', 'symmetric')
+_GPG_PARAMETERS = ('symmetric', )
 IGNORE_PARAMETERS = _GPG_PARAMETERS
 DEPRECATED_PARAMETERS = ('lvm2', 'evms2', 'gensplash', 'gensplash-res')