diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index f91d93406..71699ac80 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -1,6 +1,6 @@
-AUX aufs-correct.diff 16362 RMD160 e5b32c95ffcac55e1a3b2803bd78b7431cf20e9a SHA1 6cccf26e62e6cf4b9829297fc0e128fa30c3935c SHA256 2755c721bb91107d986df78050137383fe0f1fd04277acb3865184093cf7c08b
-AUX aufs-new.diff 16771 RMD160 503ab2da8bb8c05543734650a4c85e1eeb4fc8dc SHA1 fd73a10f6181d6e2edc8e6a970a52788062316f3 SHA256 9ec8610c5f5085add6f5fef27c50d3b5b50a7d57232f9f8079cb37cd3632f556
-AUX aufs.diff 18177 RMD160 1ec49753853ec6f656c2a484a32223cd0ae58ba8 SHA1 3bdb6e5d652742c3e735be88c560e786a32aa1ed SHA256 39288c4d53614f4b4ca451de4c4ad376f1e8377ea8909424a1d82f04dbe999d1
+AUX aufs-changes-e2fsprogs.diff 20696 RMD160 3fb4fe511c66b0c470fe294ec25adc253ebb7497 SHA1 2eae849067f772c0ce9bef1ca3614a6e757b70ef SHA256 c813f3944de549490063ced8713c26c0f82b647da2d0d8a121819f245f93bd01
+AUX aufs-correct-hacked.diff 17462 RMD160 8fca64d079b3324fa581a1866422651c743a6661 SHA1 f17ef3468e512096e10497f25dbc4ff5065dae92 SHA256 6e41a271bcb8db75930fb5dcc2ec655381d10d568f5705ddc5b0563c05cc9a3d
+AUX aufs-reference.diff 18177 RMD160 1ec49753853ec6f656c2a484a32223cd0ae58ba8 SHA1 3bdb6e5d652742c3e735be88c560e786a32aa1ed SHA256 39288c4d53614f4b4ca451de4c4ad376f1e8377ea8909424a1d82f04dbe999d1
 AUX genkernel.bash 2438 RMD160 b3d8e4436d8768c07d18c5aaff9c14fc16641729 SHA1 e15a9c6ef506aa6872a6a97d26751246dedded04 SHA256 e7de9771ba79ef878e2c9a21a1c1720f092c6047d3cc7d4a49ff6b90e7e2c248
 AUX initramfs.mounts 816 RMD160 a627d7f31ee919dc30057a1768c493229ada877f SHA1 3781d2eeb72ef0eb6b1e545d51545047e990faa1 SHA256 57ba8450e3f09edc9a4e5a1be15d49c77e4e014e27c626e9e3771167cbb54e49
 DIST LVM2.2.02.74.tgz 943084 RMD160 e5cb2a9e304c4075f05aecd03d67aa53eda9e43e SHA1 fc6cd04e4a908906c6f596ad99948140728be99c SHA256 a40c80c5b9a2547b8bd63e9321d7037c8bf041a35f734a5766ad2848d80bb697
@@ -14,7 +14,6 @@ DIST e2fsprogs-1.41.14.tar.gz 4512157 RMD160 bdd22a93f57de1145007bffd6fc45323098
 DIST e2fsprogs-1.42.tar.gz 5709827 RMD160 91136a82c35f86f54f6573f9788d32da66b972cb SHA1 e69bc63bc319e4d1e4242cc278bfd442a60646e6 SHA256 55b46db0cec3e2eb0e5de14494a88b01ff6c0500edf8ca8927cad6da7b5e4a46
 DIST fuse-2.7.4.tar.gz 506658 RMD160 fe1808cfd58ad6651259245b424301e99881faa2 SHA1 7a86f5cf39f38e64ccbae093599d64a895b950ba SHA256 c8b070ece5d4e09bd06eea6c28818c718f803d93a4b85bacb9982deb8ded49e6
 DIST fuse-2.8.6.tar.gz 505334 RMD160 df66df0256a677c50f2fc94fef6f34b2d598386c SHA1 c2c0f9fff8bfee217da200888123e5abb5b498f2 SHA256 1ec1913e38f09b2a9ec1579e1800805b5e2c747d1dce515e316dbb665ca139d6
-DIST genkernel-3.4.24.tar.bz2 211436 RMD160 3d29afb7c7bfac64e9cd09f1213fa5913de36643 SHA1 61629d89379b20b6b788c4c88153d6fe294ed657 SHA256 55611c867f1dc96c8711faabb8c17f62b1c5f8be27eb423e39fd53846552476c
 DIST genkernel-3.4.30.tar.bz2 210819 RMD160 c510bc13543ef2a96a151031d95caae41155afb2 SHA1 1d6429f2d1f2f031cdd09445c049bfda930993de SHA256 9c3d2ffac09c3e6043452daf325fc059f8f7eb774e4ea7af4d6d1d749bb7f74a
 DIST gnupg-1.4.11.tar.bz2 3407075 RMD160 9daf2dedfd4c6211fc13b8cdee8f08b8f5925378 SHA1 78e22f5cca88514ee71034aafff539c33f3c6676 SHA256 d18ceeac16e554a501170b9bfde611625252d0fe9448685a69c93bf149ee6ef6
 DIST mdadm-3.1.4.tar.bz2 288578 RMD160 f41a2be4158efac08dbe2e95f1c6812609475fad SHA1 4ee43922d38b15a930daaaa026ef1b4efacdbc8a SHA256 849ad0ad4ad3c1d2d8806a16b30e1f59ab2daf313cb103807207f7cba889ea63
@@ -22,8 +21,7 @@ DIST mdadm-3.1.5.tar.bz2 292709 RMD160 e0542c4556988cae551b3399f0f0d27e42b68bda
 DIST open-iscsi-2.0-872.tar.gz 900081 RMD160 4eacb8a94cf7712f936b52a961fa7f11774dde67 SHA1 96880185791177ba7b8970742572b46ebfe901cd SHA256 37753697a170223ac02a292b3a23a315a3c747b490c42480e4057b676c9f8d4f
 DIST unionfs-fuse-0.22.tar.bz2 27355 RMD160 f29cbf41af0ba8f2181ac565a6663871676f6488 SHA1 e95799923ee3938e1fb44c6fd9aa7154d720063e SHA256 fa0c494a8ce63f235601fcc35e3a96527831169d6d5921ee49faccf3b25feb78
 DIST unionfs-fuse-0.24.tar.bz2 30381 RMD160 27934c23472f6e9d71e622f13aa9fd51a1f8018e SHA1 26f281e4e5f1e82194b430956b94cd7745d5bd97 SHA256 d8abc855eb618ac356b1e716599c82f8f0f74dbaee36d4062edc707567121937
-EBUILD genkernel-3.4.24.ebuild 5299 RMD160 ccea52b69caca68a079946fe44ab3b3197dab81c SHA1 1f65713df4373024ecc95ee3a2508fa8d86b08d8 SHA256 2b2b5905cfdfdc61bf741b57c44fd721e29b64ca079455c689561fa44d4e354c
-EBUILD genkernel-3.4.30.ebuild 5656 RMD160 b6b39f6a463a0c8a6f434e3a9d33f6cf73477a1e SHA1 0e7e196cc04fbc5fee33c47051f6e8bc829b214b SHA256 f0a74173521d7ff018ca7789f2112eeb8ae0c65a852339548cb0543d6b6c869a
+EBUILD genkernel-3.4.30.ebuild 5675 RMD160 c39f575fd2f16d57b1418667f335a4d66bad1f5e SHA1 2f5c9f0cbb80ba26fd41b5e0d3e845bd6a06bcfa SHA256 d54cd65c75bce9fad988a807db08e671465998bea292f704b7f815cba8dcbbcf
 EBUILD genkernel-9999.2540.ebuild 5009 RMD160 bf510823f1aa9118d38d2672bcf4075d06260d23 SHA1 4b08734c9208734b9abdf0b34218bebfeb9cdc46 SHA256 54e051c18952c325edb2432a0eceaa5472e2209afd442f198eec47109e1d50f6
 EBUILD genkernel-9999.2998.ebuild 5009 RMD160 c9fc630b0ebe76dda415463bd0bab0f51a9b5efd SHA1 500bf742be83286cb0c56676e6219d72ff2eaa24 SHA256 9d33c03cd3d32f34620e2a36c3d0e11416fe40da9b3e081e15ffcc3429289bfd
 EBUILD genkernel-9999.ebuild 5009 RMD160 bf510823f1aa9118d38d2672bcf4075d06260d23 SHA1 4b08734c9208734b9abdf0b34218bebfeb9cdc46 SHA256 54e051c18952c325edb2432a0eceaa5472e2209afd442f198eec47109e1d50f6
diff --git a/sys-kernel/genkernel/files/aufs-correct.diff b/sys-kernel/genkernel/files/aufs-changes-e2fsprogs.diff
similarity index 74%
rename from sys-kernel/genkernel/files/aufs-correct.diff
rename to sys-kernel/genkernel/files/aufs-changes-e2fsprogs.diff
index 63bdc8899..e1a509b02 100644
--- a/sys-kernel/genkernel/files/aufs-correct.diff
+++ b/sys-kernel/genkernel/files/aufs-changes-e2fsprogs.diff
@@ -1,6 +1,17 @@
-diff -Naur genkernel-3.4.30/defaults/initrd.defaults genkernel/defaults/initrd.defaults
---- genkernel-3.4.30/defaults/initrd.defaults	2012-05-06 22:28:21.592425271 -0400
-+++ genkernel/defaults/initrd.defaults	2012-05-06 22:29:10.618426583 -0400
+diff -Naur '--exclude=.git' '--exclude=.svn' genkernel-3.4.18/gen_determineargs.sh /usr/src/pentoo/genkernel/trunk/gen_determineargs.sh
+--- genkernel-3.4.18/gen_determineargs.sh       2012-03-24 23:23:39.478742478 -0400
++++ /usr/src/pentoo/genkernel/trunk/gen_determineargs.sh        2012-04-23 16:27:15.229338527 -0400
+@@ -139,6 +139,7 @@
+	MDADM_BINCACHE=`cache_replace "${MDADM_BINCACHE}"`
+	DMRAID_BINCACHE=`cache_replace "${DMRAID_BINCACHE}"`
+	ISCSI_BINCACHE=`cache_replace "${ISCSI_BINCACHE}"`
++	E2FSPROGS_BINCACHE=`cache_replace "${E2FSPROGS_BINCACHE}"`
+	BLKID_BINCACHE=`cache_replace "${BLKID_BINCACHE}"`
+	FUSE_BINCACHE=`cache_replace "${FUSE_BINCACHE}"`
+	UNIONFS_FUSE_BINCACHE=`cache_replace "${UNIONFS_FUSE_BINCACHE}"`
+diff -Naur genkernel-3.4.30-orig/defaults/initrd.defaults genkernel/defaults/initrd.defaults
+--- genkernel-3.4.30-orig/defaults/initrd.defaults	2012-05-10 20:42:13.361195669 -0400
++++ genkernel/defaults/initrd.defaults	2012-05-10 20:42:48.341196605 -0400
 @@ -73,6 +73,7 @@
  NEW_ROOT='/newroot'
  CDROOT_PATH='/mnt/cdrom'
@@ -9,9 +20,9 @@ diff -Naur genkernel-3.4.30/defaults/initrd.defaults genkernel/defaults/initrd.d
  
  LOOPS='/livecd.loop /zisofs /livecd.squashfs /image.squashfs /livecd.gcloop'
  
-diff -Naur genkernel-3.4.30/defaults/initrd.scripts genkernel/defaults/initrd.scripts
---- genkernel-3.4.30/defaults/initrd.scripts	2012-05-06 22:28:21.594425271 -0400
-+++ genkernel/defaults/initrd.scripts	2012-05-06 22:29:10.619426583 -0400
+diff -Naur genkernel-3.4.30-orig/defaults/initrd.scripts genkernel/defaults/initrd.scripts
+--- genkernel-3.4.30-orig/defaults/initrd.scripts	2012-05-10 20:42:13.362195669 -0400
++++ genkernel/defaults/initrd.scripts	2012-05-10 20:42:48.341196605 -0400
 @@ -207,6 +207,192 @@
  	[ ${ret} -eq 0 ] || bad_msg "Failed to mount /sys!"
  }
@@ -205,9 +216,9 @@ diff -Naur genkernel-3.4.30/defaults/initrd.scripts genkernel/defaults/initrd.sc
  findnfsmount() {
  	if [ "${IP}" != '' ] || busybox udhcpc -n -T 15 -q
  	then
-diff -Naur genkernel-3.4.30/defaults/linuxrc genkernel/defaults/linuxrc
---- genkernel-3.4.30/defaults/linuxrc	2012-05-06 22:28:21.592425271 -0400
-+++ genkernel/defaults/linuxrc	2012-05-06 22:52:33.523464151 -0400
+diff -Naur genkernel-3.4.30-orig/defaults/linuxrc genkernel/defaults/linuxrc
+--- genkernel-3.4.30-orig/defaults/linuxrc	2012-05-10 20:42:13.361195669 -0400
++++ genkernel/defaults/linuxrc	2012-05-10 20:44:13.530198887 -0400
 @@ -228,6 +228,38 @@
  		aufs)
  			USE_AUFS_NORMAL=1
@@ -295,7 +306,23 @@ diff -Naur genkernel-3.4.30/defaults/linuxrc genkernel/defaults/linuxrc
  	then
  		bootstrapCD
  	fi
-@@ -709,7 +752,23 @@
+@@ -663,10 +706,11 @@
+ 					fi
+ 					do_rundebugshell
+ 				}
+-			else
+-				good_msg 'Mounting squashfs & aufs filesystems'
+-				setup_squashfs_aufs
+-				test_success 'Mount filesystem'
++			#XXX: this feels dirty and I apologize for that, but I am nearly certain this is breaking my aufs patches
++			#else
++				#good_msg 'Mounting squashfs & aufs filesystems'
++				#setup_squashfs_aufs
++				#test_success 'Mount filesystem'
+ 			fi
+ 			FS_LOCATION='mnt/livecd'
+ 		elif [ "${LOOPTYPE}" = 'gcloop' ]
+@@ -709,7 +753,23 @@
  		fi
  	fi
  
@@ -319,7 +346,7 @@ diff -Naur genkernel-3.4.30/defaults/linuxrc genkernel/defaults/linuxrc
  
  	# Unpacking additional packages from NFS mount
  	# This is useful for adding kernel modules to /lib
-@@ -732,57 +791,56 @@
+@@ -732,57 +792,56 @@
  	then
  		setup_unionfs ${NEW_ROOT} /${FS_LOCATION}
  		CHROOT=/union
@@ -418,7 +445,7 @@ diff -Naur genkernel-3.4.30/defaults/linuxrc genkernel/defaults/linuxrc
  	fi
  
  	#UML=$(cat /proc/cpuinfo|grep UML|sed -e 's|model name.*: ||')
-@@ -803,13 +861,18 @@
+@@ -803,13 +862,18 @@
  		setup_unionfs /union_changes ${NEW_ROOT}
  		mkdir -p ${UNION}/tmp/.initrd
  	fi
@@ -438,7 +465,7 @@ diff -Naur genkernel-3.4.30/defaults/linuxrc genkernel/defaults/linuxrc
  fi
  
  for fs in $fslist; do
-@@ -842,6 +905,35 @@
+@@ -842,6 +906,35 @@
  
  verbose_kmsg
  
@@ -474,9 +501,9 @@ diff -Naur genkernel-3.4.30/defaults/linuxrc genkernel/defaults/linuxrc
  echo -ne "${GOOD}>>${NORMAL}${BOLD} Booting (initramfs)${NORMAL}"
  
  cd "${CHROOT}"
-diff -Naur genkernel-3.4.30/gen_initramfs.sh genkernel/gen_initramfs.sh
---- genkernel-3.4.30/gen_initramfs.sh	2012-05-06 22:28:21.596425271 -0400
-+++ genkernel/gen_initramfs.sh	2012-05-06 22:29:10.619426583 -0400
+diff -Naur genkernel-3.4.30-orig/gen_initramfs.sh genkernel/gen_initramfs.sh
+--- genkernel-3.4.30-orig/gen_initramfs.sh	2012-05-10 20:42:13.364195669 -0400
++++ genkernel/gen_initramfs.sh	2012-05-10 20:42:48.342196605 -0400
 @@ -99,6 +99,24 @@
  	rm -rf "${TEMP}/initramfs-busybox-temp" > /dev/null
  }
@@ -518,3 +545,77 @@ diff -Naur genkernel-3.4.30/gen_initramfs.sh genkernel/gen_initramfs.sh
  	append_data 'lvm' "${LVM}"
  	append_data 'dmraid' "${DMRAID}"
  	append_data 'iscsi' "${ISCSI}"
+diff -Naur genkernel-3.4.18/genkernel.conf trunk/genkernel.conf
+--- genkernel-3.4.18/genkernel.conf     2012-03-24 23:23:39.479742473 -0400
++++ trunk/genkernel.conf       2011-10-16 21:32:05.000000000 -0400
+@@ -229,6 +229,7 @@ XXX: seperate patch for this
+ E2FSPROGS_VER="VERSION_E2FSPROGS"
+ E2FSPROGS_DIR="e2fsprogs-${E2FSPROGS_VER}"
+ E2FSPROGS_SRCTAR="${DISTDIR}/e2fsprogs-${E2FSPROGS_VER}.tar.gz"
++E2FSPROGS_BINCACHE="%%CACHE%%/e2fsprogs-${E2FSPROGS_VER}-%%ARCH%%.bz2"
+ BLKID_BINCACHE="%%CACHE%%/blkid-${E2FSPROGS_VER}-%%ARCH%%.bz2"
+ 
+ FUSE_VER="VERSION_FUSE"
+
+diff -Naur '--exclude=.git' '--exclude=.svn' genkernel-3.4.18/gen_compile.sh pentoo/genkernel/trunk//gen_compile.sh
+--- genkernel-3.4.18/gen_compile.sh	2012-03-24 23:23:39.477742482 -0400
++++ pentoo/genkernel/trunk//gen_compile.sh	2012-04-23 16:27:15.229338527 -0400
+@@ -612,6 +612,58 @@
+ 	fi
+ }
+ 
++compile_e2fstools() {
++	if [ -f "${E2FSPROGS_BINCACHE}" ]
++	then
++		print_info 1 "e2fstools: >> Using cache"
++	else
++		[ ! -f "${E2FSPROGS_SRCTAR}" ] &&
++			gen_die "Could not find e2fsprogs source tarball: ${E2FSPROGS_SRCTAR}. Please place it there, or place another version, changing /etc/genkernel.conf as necessary!"
++		cd "${TEMP}"
++		rm -rf "${E2FSPROGS_DIR}"
++		tar -zxpf "${E2FSPROGS_SRCTAR}"
++		[ ! -d "${E2FSPROGS_DIR}" ] &&
++			gen_die "e2fsprogs directory ${E2FSPROGS_DIR} invalid"
++		cd "${E2FSPROGS_DIR}"
++		print_info 1 'e2fsprogs: >> Configuring...'
++		LDFLAGS="-static" ./configure >> ${LOGFILE} 2>&1 ||
++			gen_die 'Configuring e2fsprogs failed!'
++		print_info 1 'e2fsprogs: >> Compiling libs...'
++		#MAKE=${UTILS_MAKE} compile_generic "" ""
++		make libs >> ${LOGFILE} 2>&1 ||
++			gen_die 'Compiling e2fsprogs libs failed!'
++		print_info 1 'e2fsprogs: >> Compiling e2fsck...'
++		cd "${TEMP}/${E2FSPROGS_DIR}/e2fsck"
++		make e2fsck.static >> ${LOGFILE} 2>&1 ||
++			gen_die 'Compiling static e2fsck failed!'
++		cd "${TEMP}/${E2FSPROGS_DIR}/misc"
++		print_info 1 'e2fsprogs: >> Compiling mke2fs...'
++		make mke2fs.static >> ${LOGFILE} 2>&1 ||
++			gen_die 'Compiling static mke2fs failed!'
++		cd "${TEMP}/${E2FSPROGS_DIR}"
++		print_info 1 'e2fsprogs: >> Copying to cache...'
++		[ -f "${TEMP}/${E2FSPROGS_DIR}/misc/mke2fs.static" ] ||
++			gen_die 'mke2fs executable does not exist!'
++		[ -f "${TEMP}/${E2FSPROGS_DIR}/e2fsck/e2fsck.static" ] ||
++			gen_die 'e2fsck executable does not exist!'
++		strip "${TEMP}/${E2FSPROGS_DIR}/misc/mke2fs.static" "${TEMP}/${E2FSPROGS_DIR}/e2fsck/e2fsck.static" ||
++			gen_die 'Could not strip e2fs binaries!'
++
++		mkdir "${TEMP}/e2fsprogs"
++		mkdir "${TEMP}/e2fsprogs/sbin"
++		install -m 0755 -s misc/mke2fs.static "${TEMP}/e2fsprogs/sbin/mke2fs"
++		install -m 0755 -s e2fsck/e2fsck.static "${TEMP}/e2fsprogs/sbin/e2fsck"
++		print_info 1 '      >> Copying to bincache...'
++		cd "${TEMP}/e2fsprogs"
++		/bin/tar -cjf "${E2FSPROGS_BINCACHE}" sbin/ ||
++			gen_die 'Could not create binary cache'
++
++		cd "${TEMP}"
++		rm -rf "${TEMP}/e2fsprogs" > /dev/null
++		rm -rf "${E2FSPROGS_DIR}" > /dev/null
++	fi
++}
++
+ compile_fuse() {
+ 	if [ ! -f "${FUSE_BINCACHE}" ]
+ 	then
diff --git a/sys-kernel/genkernel/files/aufs-new.diff b/sys-kernel/genkernel/files/aufs-correct-hacked.diff
similarity index 88%
rename from sys-kernel/genkernel/files/aufs-new.diff
rename to sys-kernel/genkernel/files/aufs-correct-hacked.diff
index 3d7472c95..6432f29c6 100644
--- a/sys-kernel/genkernel/files/aufs-new.diff
+++ b/sys-kernel/genkernel/files/aufs-correct-hacked.diff
@@ -1,6 +1,6 @@
-diff -Naur genkernel-orig/defaults/initrd.defaults genkernel/defaults/initrd.defaults
---- genkernel-orig/defaults/initrd.defaults	2012-05-05 22:03:33.670071698 -0400
-+++ genkernel/defaults/initrd.defaults	2012-05-05 23:32:20.558214466 -0400
+diff -Naur genkernel-3.4.30-orig/defaults/initrd.defaults genkernel/defaults/initrd.defaults
+--- genkernel-3.4.30-orig/defaults/initrd.defaults	2012-05-10 20:42:13.361195669 -0400
++++ genkernel/defaults/initrd.defaults	2012-05-10 20:42:48.341196605 -0400
 @@ -73,6 +73,7 @@
  NEW_ROOT='/newroot'
  CDROOT_PATH='/mnt/cdrom'
@@ -9,10 +9,10 @@ diff -Naur genkernel-orig/defaults/initrd.defaults genkernel/defaults/initrd.def
  
  LOOPS='/livecd.loop /zisofs /livecd.squashfs /image.squashfs /livecd.gcloop'
  
-diff -Naur genkernel-orig/defaults/initrd.scripts genkernel/defaults/initrd.scripts
---- genkernel-orig/defaults/initrd.scripts	2012-05-05 22:03:33.670071698 -0400
-+++ genkernel/defaults/initrd.scripts	2012-05-05 22:58:33.661160192 -0400
-@@ -201,6 +201,192 @@
+diff -Naur genkernel-3.4.30-orig/defaults/initrd.scripts genkernel/defaults/initrd.scripts
+--- genkernel-3.4.30-orig/defaults/initrd.scripts	2012-05-10 20:42:13.362195669 -0400
++++ genkernel/defaults/initrd.scripts	2012-05-10 20:42:48.341196605 -0400
+@@ -207,6 +207,192 @@
  	[ ${ret} -eq 0 ] || bad_msg "Failed to mount /sys!"
  }
  
@@ -205,10 +205,10 @@ diff -Naur genkernel-orig/defaults/initrd.scripts genkernel/defaults/initrd.scri
  findnfsmount() {
  	if [ "${IP}" != '' ] || busybox udhcpc -n -T 15 -q
  	then
-diff -Naur genkernel-orig/defaults/linuxrc genkernel/defaults/linuxrc
---- genkernel-orig/defaults/linuxrc	2012-05-05 22:03:33.670071698 -0400
-+++ genkernel/defaults/linuxrc	2012-05-06 00:55:04.606347647 -0400
-@@ -220,6 +220,38 @@
+diff -Naur genkernel-3.4.30-orig/defaults/linuxrc genkernel/defaults/linuxrc
+--- genkernel-3.4.30-orig/defaults/linuxrc	2012-05-10 20:42:13.361195669 -0400
++++ genkernel/defaults/linuxrc	2012-05-10 20:44:13.530198887 -0400
+@@ -228,6 +228,38 @@
  		aufs)
  			USE_AUFS_NORMAL=1
  		;;
@@ -247,7 +247,7 @@ diff -Naur genkernel-orig/defaults/linuxrc genkernel/defaults/linuxrc
  		unionfs)
  			if [ ! -x /sbin/unionfs ]
  			then
-@@ -346,17 +378,28 @@
+@@ -382,17 +414,28 @@
  
  if [ "${CDROOT}" = '1' ]
  then
@@ -286,7 +286,7 @@ diff -Naur genkernel-orig/defaults/linuxrc genkernel/defaults/linuxrc
  
  	# For SGI LiveCDs ...
  	if [ "${LOOPTYPE}" = "sgimips" ]
-@@ -372,7 +415,7 @@
+@@ -408,7 +451,7 @@
  		[ ! -e "${NEW_ROOT}/dev/tty1" ] && mknod "${NEW_ROOT}/dev/tty1" c 4 1
  	fi
  
@@ -295,7 +295,23 @@ diff -Naur genkernel-orig/defaults/linuxrc genkernel/defaults/linuxrc
  	then
  		bootstrapCD
  	fi
-@@ -608,7 +651,23 @@
+@@ -663,10 +706,11 @@
+ 					fi
+ 					do_rundebugshell
+ 				}
+-			else
+-				good_msg 'Mounting squashfs & aufs filesystems'
+-				setup_squashfs_aufs
+-				test_success 'Mount filesystem'
++			#XXX: this feels dirty and I apologize for that, but I am nearly certain this is breaking my aufs patches
++			#else
++				#good_msg 'Mounting squashfs & aufs filesystems'
++				#setup_squashfs_aufs
++				#test_success 'Mount filesystem'
+ 			fi
+ 			FS_LOCATION='mnt/livecd'
+ 		elif [ "${LOOPTYPE}" = 'gcloop' ]
+@@ -709,7 +753,23 @@
  		fi
  	fi
  
@@ -319,21 +335,25 @@ diff -Naur genkernel-orig/defaults/linuxrc genkernel/defaults/linuxrc
  
  	# Unpacking additional packages from NFS mount
  	# This is useful for adding kernel modules to /lib
-@@ -632,53 +691,57 @@
+@@ -732,57 +792,56 @@
+ 	then
  		setup_unionfs ${NEW_ROOT} /${FS_LOCATION}
  		CHROOT=/union
- 	elif [ "${USE_AUFS_NORMAL}" != '1' ]; then
-+	#XXX the above line was added after my fork and confuses the hell out of me as it seems to have no fi
-+	#XXX this hunk confuses me more than a little and needs to be rewritten sanely
- 
+-	elif [ "${USE_AUFS_NORMAL}" != '1' ]; then
+-
 -	good_msg "Copying read-write image contents to tmpfs"
 -	# Copy over stuff that should be writable
--	(cd "${NEW_ROOT}/${FS_LOCATION}"; cp -a ${ROOT_TREES} "${NEW_ROOT}")
+-	(cd "${NEW_ROOT}/${FS_LOCATION}"; cp -a ${ROOT_TREES} "${NEW_ROOT}") || {
+-		bad_msg "Copying failed, dropping into a shell."
+-		do_rundebugshell
+-	}
 -
 -	# Now we do the links.
 -	for x in ${ROOT_LINKS}
 -	do
 -		if [ -L "${NEW_ROOT}/${FS_LOCATION}/${x}" ]
++	else
++	#XXX this hunk confuses me more than a little and needs to be rewritten sanely
 +		if [ ! "${USE_AUFS_NORMAL}" -eq '1' ]
  		then
 -			ln -s "$(readlink ${NEW_ROOT}/${FS_LOCATION}/${x})" "${x}" 2>/dev/null
@@ -404,17 +424,17 @@ diff -Naur genkernel-orig/defaults/linuxrc genkernel/defaults/linuxrc
  			done
 +			mkdir initramfs proc tmp sys 2>/dev/null
 +			chmod 1777 tmp
-+#XXX: end extremely confusing hunk
  		fi
 -	done
 -
 -	mkdir initramfs proc tmp sys 2>/dev/null
 -	chmod 1777 tmp
 -
++	#XXX: end extremely confusing hunk
  	fi
  
  	#UML=$(cat /proc/cpuinfo|grep UML|sed -e 's|model name.*: ||')
-@@ -699,6 +762,11 @@
+@@ -803,13 +862,18 @@
  		setup_unionfs /union_changes ${NEW_ROOT}
  		mkdir -p ${UNION}/tmp/.initrd
  	fi
@@ -426,7 +446,15 @@ diff -Naur genkernel-orig/defaults/linuxrc genkernel/defaults/linuxrc
  fi
  
  # Mount the additional things as required by udev & systemd
-@@ -734,6 +802,35 @@
+ if [ -f ${NEW_ROOT}/etc/initramfs.mounts ]; then
+ 	fslist=$(get_mounts_list)
+ else
+-	fslist="/usr" 
++	fslist="/usr"
+ fi
+ 
+ for fs in $fslist; do
+@@ -842,6 +906,35 @@
  
  verbose_kmsg
  
@@ -462,10 +490,10 @@ diff -Naur genkernel-orig/defaults/linuxrc genkernel/defaults/linuxrc
  echo -ne "${GOOD}>>${NORMAL}${BOLD} Booting (initramfs)${NORMAL}"
  
  cd "${CHROOT}"
-diff -Naur genkernel-orig/gen_initramfs.sh genkernel/gen_initramfs.sh
---- genkernel-orig/gen_initramfs.sh	2012-05-05 22:03:33.674071708 -0400
-+++ genkernel/gen_initramfs.sh	2012-05-05 23:53:17.352248333 -0400
-@@ -77,6 +77,24 @@
+diff -Naur genkernel-3.4.30-orig/gen_initramfs.sh genkernel/gen_initramfs.sh
+--- genkernel-3.4.30-orig/gen_initramfs.sh	2012-05-10 20:42:13.364195669 -0400
++++ genkernel/gen_initramfs.sh	2012-05-10 20:42:48.342196605 -0400
+@@ -99,6 +99,24 @@
  	rm -rf "${TEMP}/initramfs-busybox-temp" > /dev/null
  }
  
@@ -490,7 +518,7 @@ diff -Naur genkernel-orig/gen_initramfs.sh genkernel/gen_initramfs.sh
  append_blkid(){
  	if [ -d "${TEMP}/initramfs-blkid-temp" ]
  	then
-@@ -528,6 +546,7 @@
+@@ -544,6 +562,7 @@
  		rm -r "${TEMP}/initramfs-aux-temp/"
  	fi
  	mkdir -p "${TEMP}/initramfs-aux-temp/etc"
@@ -498,7 +526,7 @@ diff -Naur genkernel-orig/gen_initramfs.sh genkernel/gen_initramfs.sh
  	mkdir -p "${TEMP}/initramfs-aux-temp/sbin"
  	if [ -f "${CMD_LINUXRC}" ]
  	then
-@@ -641,6 +660,7 @@
+@@ -660,6 +679,7 @@
  	append_data 'base_layout'
  	append_data 'auxilary' "${BUSYBOX}"
  	append_data 'busybox' "${BUSYBOX}"
diff --git a/sys-kernel/genkernel/files/aufs.diff b/sys-kernel/genkernel/files/aufs-reference.diff
similarity index 100%
rename from sys-kernel/genkernel/files/aufs.diff
rename to sys-kernel/genkernel/files/aufs-reference.diff
diff --git a/sys-kernel/genkernel/genkernel-3.4.24.ebuild b/sys-kernel/genkernel/genkernel-3.4.24.ebuild
deleted file mode 100644
index 03d07522b..000000000
--- a/sys-kernel/genkernel/genkernel-3.4.24.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# 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.24.ebuild,v 1.1 2012/01/24 23:30:18 sping Exp $
-
-# genkernel-9999        -> latest Git branch "master"
-# genkernel-VERSION     -> normal genkernel release
-
-VERSION_BUSYBOX='1.19.3'
-VERSION_DMAP='1.02.22'
-VERSION_DMRAID='1.0.0.rc14'
-VERSION_MDADM='3.1.5'
-VERSION_E2FSPROGS='1.42'
-VERSION_FUSE='2.8.6'
-VERSION_ISCSI='2.0-872'
-VERSION_LVM='2.02.88'
-VERSION_UNIONFS_FUSE='0.24'
-VERSION_GPG='1.4.11'
-
-MY_HOME="http://wolf31o2.org"
-RH_HOME="ftp://sources.redhat.com/pub"
-DM_HOME="http://people.redhat.com/~heinzm/sw/dmraid/src"
-BB_HOME="http://www.busybox.net/downloads"
-
-COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
-		${DM_HOME}/old/dmraid-${VERSION_DMRAID}.tar.bz2
-		mirror://kernel/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.bz2
-		${RH_HOME}/lvm2/LVM2.${VERSION_LVM}.tgz
-		${RH_HOME}/lvm2/old/LVM2.${VERSION_LVM}.tgz
-		${RH_HOME}/dm/device-mapper.${VERSION_DMAP}.tgz
-		${RH_HOME}/dm/old/device-mapper.${VERSION_DMAP}.tgz
-		${BB_HOME}/busybox-${VERSION_BUSYBOX}.tar.bz2
-		mirror://kernel/linux/kernel/people/mnc/open-iscsi/releases/open-iscsi-${VERSION_ISCSI}.tar.gz
-		mirror://sourceforge/e2fsprogs/e2fsprogs-${VERSION_E2FSPROGS}.tar.gz
-		mirror://sourceforge/fuse/fuse-${VERSION_FUSE}.tar.gz
-		http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
-		mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2"
-
-if [[ ${PV} == 9999* ]]
-then
-	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/${PN}.git
-		http://git.overlays.gentoo.org/gitroot/proj/${PN}.git"
-	inherit git-2 bash-completion eutils
-	S="${WORKDIR}/${PN}"
-	SRC_URI="${COMMON_URI}"
-	KEYWORDS=""
-else
-	inherit bash-completion eutils
-	SRC_URI="mirror://gentoo/${P}.tar.bz2
-		${MY_HOME}/sources/genkernel/${P}.tar.bz2
-		${COMMON_URI}"
-	# Please don't touch individual KEYWORDS.  Since this is maintained/tested by
-	# Release Engineering, it's easier for us to deal with all arches at once.
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-fi
-
-DESCRIPTION="Gentoo automatic kernel building scripts"
-HOMEPAGE="http://www.gentoo.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT=""
-IUSE="ibm pentoo selinux"
-
-DEPEND="sys-fs/e2fsprogs
-	selinux? ( sys-libs/libselinux )"
-RDEPEND="${DEPEND} app-arch/cpio"
-
-if [[ ${PV} == 9999* ]]; then
-	DEPEND="${DEPEND} app-text/asciidoc"
-fi
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]] ; then
-		git-2_src_unpack
-	else
-		unpack ${P}.tar.bz2
-	fi
-	use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
-	use pentoo && cd "${S}"
-	use pentoo && epatch "${FILESDIR}"/aufs-new.diff
-}
-
-src_compile() {
-	if [[ ${PV} == 9999* ]]; then
-		emake || die
-	fi
-}
-
-src_install() {
-	# This block updates genkernel.conf
-	sed \
-		-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
-		-e "s:VERSION_DMAP:$VERSION_DMAP:" \
-		-e "s:VERSION_MDADM:$VERSION_MDADM:" \
-		-e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
-		-e "s:VERSION_E2FSPROGS:$VERSION_E2FSPROGS:" \
-		-e "s:VERSION_FUSE:$VERSION_FUSE:" \
-		-e "s:VERSION_ISCSI:$VERSION_ISCSI:" \
-		-e "s:VERSION_LVM:$VERSION_LVM:" \
-		-e "s:VERSION_UNIONFS_FUSE:$VERSION_UNIONFS_FUSE:" \
-		-e "s:VERSION_GPG:$VERSION_GPG:" \
-		"${S}"/genkernel.conf > "${T}"/genkernel.conf \
-		|| die "Could not adjust versions"
-	insinto /etc
-	doins "${T}"/genkernel.conf || die "doins genkernel.conf"
-
-	doman genkernel.8 || die "doman"
-	dodoc AUTHORS ChangeLog README TODO || die "dodoc"
-
-	dobin genkernel || die "dobin genkernel"
-
-	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
-
-	insinto /usr/share/genkernel
-	doins -r "${S}"/* || die "doins"
-	use ibm && cp "${S}"/ppc64/kernel-2.6-pSeries "${S}"/ppc64/kernel-2.6 || \
-		cp "${S}"/arch/ppc64/kernel-2.6.g5 "${S}"/arch/ppc64/kernel-2.6
-
-	# Copy files to /var/cache/genkernel/src
-	elog "Copying files to /var/cache/genkernel/src..."
-	mkdir -p "${D}"/var/cache/genkernel/src
-	cp -f \
-		"${DISTDIR}"/mdadm-${VERSION_MDADM}.tar.bz2 \
-		"${DISTDIR}"/dmraid-${VERSION_DMRAID}.tar.bz2 \
-		"${DISTDIR}"/LVM2.${VERSION_LVM}.tgz \
-		"${DISTDIR}"/device-mapper.${VERSION_DMAP}.tgz \
-		"${DISTDIR}"/e2fsprogs-${VERSION_E2FSPROGS}.tar.gz \
-		"${DISTDIR}"/busybox-${VERSION_BUSYBOX}.tar.bz2 \
-		"${DISTDIR}"/fuse-${VERSION_FUSE}.tar.gz \
-		"${DISTDIR}"/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2 \
-		"${DISTDIR}"/gnupg-${VERSION_GPG}.tar.bz2 \
-		"${DISTDIR}"/open-iscsi-${VERSION_ISCSI}.tar.gz \
-		"${D}"/var/cache/genkernel/src || die "Copying distfiles..."
-
-	dobashcompletion "${FILESDIR}"/genkernel.bash
-}
-
-pkg_postinst() {
-	echo
-	elog 'Documentation is available in the genkernel manual page'
-	elog 'as well as the following URL:'
-	echo
-	elog 'http://www.gentoo.org/doc/en/genkernel.xml'
-	echo
-	ewarn "This package is known to not work with reiser4.  If you are running"
-	ewarn "reiser4 and have a problem, do not file a bug.  We know it does not"
-	ewarn "work and we don't plan on fixing it since reiser4 is the one that is"
-	ewarn "broken in this regard.  Try using a sane filesystem like ext3 or"
-	ewarn "even reiser3."
-	echo
-	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
-
-	bash-completion_pkg_postinst
-}
diff --git a/sys-kernel/genkernel/genkernel-3.4.30.ebuild b/sys-kernel/genkernel/genkernel-3.4.30.ebuild
index c0ae6e521..25fb781c7 100644
--- a/sys-kernel/genkernel/genkernel-3.4.30.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.4.30.ebuild
@@ -38,12 +38,12 @@ if [[ ${PV} == 9999* ]]
 then
 	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/${PN}.git
 		http://git.overlays.gentoo.org/gitroot/proj/${PN}.git"
-	inherit git-2 bash-completion eutils
+	inherit git-2 bash-completion-r1 eutils
 	S="${WORKDIR}/${PN}"
 	SRC_URI="${COMMON_URI}"
 	KEYWORDS=""
 else
-	inherit bash-completion eutils
+	inherit bash-completion-r1 eutils
 	SRC_URI="mirror://gentoo/${P}.tar.bz2
 		${MY_HOME}/sources/genkernel/${P}.tar.bz2
 		${COMMON_URI}"
@@ -81,7 +81,7 @@ src_unpack() {
 	fi
 	use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
 	use pentoo && cd "${S}"
-	use pentoo && epatch "${FILESDIR}"/aufs-correct.diff
+	use pentoo && epatch "${FILESDIR}"/aufs-changes-e2fsprogs.diff
 }
 
 src_compile() {
@@ -134,7 +134,7 @@ src_install() {
 		"${DISTDIR}"/open-iscsi-${VERSION_ISCSI}.tar.gz \
 		"${D}"/var/cache/genkernel/src || die "Copying distfiles..."
 
-	dobashcompletion "${FILESDIR}"/genkernel.bash
+	newbashcomp "${FILESDIR}"/genkernel.bash "${PN}"
 	insinto /etc
 	doins "${FILESDIR}"/initramfs.mounts
 }